Commit Graph

31553 Commits

Author SHA1 Message Date
Tobias Hunger
0b5639f735 KitInformationConfigWidget: Make id of KitInformation accessible
Make the id of the kitinformation the config widget is configuring
accessible from the widget.

Change-Id: I15af2cfc18ab2ba012d43c3c6b71ee0011f994ad
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-17 13:25:16 +02:00
Tobias Hunger
d2adc30335 BuildConfigurationFactory: Refactor code
Refactor the code of the build configuration factories. The idea is to
generalize the code so much that we can allow plugins to install
custom build configuration factories for the platforms they support.

To support this use case the following changes where done here:
 * BuildInfo class was introduced to describe one build configuration that
   can be created by a factory.
 * Factories report a list of BuildInfo to describe what they can produce.
   This fixes the need for factories to implicitly create one buildconfiguration
   and then create another one 'officially' to support debug and release build
   configurations to be set up for projects.
 * Do no longer work around factories to create build configurations.

Change-Id: Ic372e4a9b5c582633b467d130538948472b89d91
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-17 12:00:01 +02:00
Thomas Hartmann
ec436a6d64 QmlDesigner.PropertyEditor: initial prototype for QtQuick 2
Change-Id: I85eac02934cd5f7f2f4664b9642c55bb3a23aa1e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-17 10:15:46 +02:00
Tobias Hunger
d7674e45c2 KitInformation: Delete subwidgets in destructor
Change-Id: I7e0a6d457aa26748758b6402955c81eae2c94782
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-17 10:13:26 +02:00
Kai Koehne
38ab088cb1 plugins: Simplify checks for declarative
We can expect people with Qt 5.1 to also have QtQuick.

Change-Id: I84b0323c6ea11b46f3ee41c0bbdc5f059643f208
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-17 09:57:55 +02:00
Christian Kandeler
3ae8d6b36a Fix qbs build.
Commit cf56178d introduced an impressive amount of syntax errors.

Change-Id: Ibaf8b8384b06ee92b658b71f08ac8d14e92c19b0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-17 07:46:06 +02:00
Thomas Hartmann
5ed046f1c1 QmlDesigner.Navigator: more checks for the reparenting button
We check for defaultPropertyIsComponent() and the metaInfo has to be valid.

Change-Id: I957c8440facec0ba54e527f2eda40926c5637b31
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-16 17:00:27 +02:00
Thomas Hartmann
2b8ab0afd1 QmlDesigner.FormEditor: Adding check to FormEditorItem::isContainer
An item is not considered a container if the default property is
a component.

Change-Id: I73453fb17d6c181cdd79cd6620307e5c30cac09d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-16 17:00:23 +02:00
Thomas Hartmann
494d16f3cc QmlDesigner.FormEditor: using FormEditorItem::isContainer in MoveTool
Change-Id: Ie30c0409cb2288c8c2cf649a92e7b54aa9481cb2
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-16 16:52:44 +02:00
Thomas Hartmann
a2fee4c689 QmlDesigner.NodeMetainfo: adding defaultPropertyIsComponent()
This can be used to check if reparenting makes sense.

Change-Id: Ide1146841be76d8979dc452954fc6965ecdfef3d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-16 16:52:38 +02:00
Thomas Hartmann
9e58ab2ac8 QmlProfiler: Initial conversion from Quick 1 to Quick 2
Updated class names and functions. Fixed imports.

Change-Id: I5f12e3a108a0e60c091acc9c415ff77e52118029
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-09-16 14:35:53 +02:00
David Schulz
8e281fe27b Editor: Make "Visualize Whitespace" checkable again.
Change-Id: Idb327a9ecefe5a4b55e9f0f47edfec30ae634289
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-16 13:54:27 +02:00
Thomas Hartmann
dce623b1bf QmlDesigner: Porting to Qt Quick 2
This patch ports our Qt Quick views to Qt Quick 2.

Change-Id: Ie0cfd81e7ebb76d2ed667211ad063feaaff5aa14
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-16 13:36:58 +02:00
Jens Bache-Wiig
cf56178df1 Port welcome screen to Qt Quick 2
This ports the welcome screen to use QtQuick 2.0.
I have disabled the plugin on Qt4 builds.

Change-Id: Ia921d0747c8f7d4441c88fc9fb77b822496091f4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-16 13:31:59 +02:00
Oleksii Serdiuk
328a24edee CMake: Make CMake plugin work with RemoteLinux plugin.
Modified CMake plugin to work correctly with RemoteLinux plugin.
Because of not being able to extract files to be installed from CMake
project, only executable targets are automatically added to deployment
files. All other files have to be specified in CMakeDeployment.txt file
which should be placed into root of CMake project. The file format is:
> deployment/prefix
> relative/source/file1:relative/destination/dir1
> ...
> relative/source/filen:relative/destination/dirn

Where:
- deployment/prefix is (absolute) path prefix to which files will be
  deployed on the remote machine.
- relative/source/file is file path relative to CMake project root.
  Plain files - no directories or wildcards supported.
- relative/destination/dir is destination directory path relative to
  deployment/prefix.

Change-Id: I0831636c1b9aac3ff16bb6293104c512d2abfb5a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-16 13:30:54 +02:00
Christian Kandeler
0392435ddb Autotests: Do not set the QT_USE_FAST_CONCATENATION macro in qbs build.
The one test for which we included it does not need it anymore,
and the StringUtils test fails to link on Windows when it is present,
so remove it again.

Change-Id: Iebe810c82842047a323f65722a61940271f921f3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-16 11:17:21 +02:00
Christian Kandeler
68a966cb2f Fix qbs project files for valgrind autotests.
They did not build on Windows.

Change-Id: I0c688b8e1b78e9bb06e2efd6e2cbf8791f272bc2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-16 11:16:49 +02:00
hjk
235abbb242 Debugger: Remove the {type}&main performance hack
While this was great two years ago it seems to backfire with
some of the recent gdb builds.

Change-Id: I63ed1e225edeb0e59f079a5e9b5b8c92f3031c7d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-13 18:01:35 +02:00
Oleksii Serdiuk
944b94d700 Fix: "Deploy Project" menu item is always disabled.
There was a typo in ad58c2bb44 that caused
incorrect result of the check.

Change-Id: Ie4e6dca08892eb19d9e0e66c5252670865d17144
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-13 17:00:59 +02:00
Kai Koehne
3bdc50d1b1 Fix break point warning dialog
QMessageBox apparently only saves the state in the actual
QMessageBox instance ... anyhow, it's the only place in
QtCreator where we use QMessageBox, which makes it look
somewhat alien. Instead, use CheckableMessageBox and
extend it for an information dialog.

Task-number: QTCREATORBUG-9876

Change-Id: I8014e972943dd4a336952325ebb9f6cbc5dd0902
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-13 16:24:30 +02:00
Orgad Shaneh
f29ce3d9b9 DiffEditor: Preserve source for state recovery
Task-number: QTCREATORBUG-10126
Change-Id: I707e7cdac84c91d52c5661718ac48e3d79fc7c91
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-13 15:45:36 +02:00
Nikolai Kosjar
18bba097bd C++: Stricter checking in TemplateNameId::Compare
Change-Id: I96dbce004d18147fd91485b1117dc65c4bbc08a0
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-09-13 15:41:15 +02:00
Nikolai Kosjar
190fb44882 CppTools: Fix qualified ids in the symbol searcher
The leaves in the treeview contained qualified ids.

Change-Id: I290eaf9b1e666b6879d6d4b1f2483cfe7fb85362
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-09-13 15:41:02 +02:00
Nikolai Kosjar
75b0429e29 CppTools: Locator Tests: Make test data more descriptive
Change-Id: I23e88c8a04f82d51651038b38faf07057244fede
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-09-13 15:40:55 +02:00
Nikolai Kosjar
91dbac0303 CppTools: Fix qualified ids in the ':' locator filter
* Always display qualified ids in the ':' filter
* Show correct qualified ids (for some symbols the namespace was shown
  twice)

Task-number: QTCREATORBUG-10136

Change-Id: Id178cb4b8abcc316250fa16e5f3e5a8e72bc0c10
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-09-13 15:40:48 +02:00
hjk
feef5cac4c Debugger/RemoteLinux: Make gdbserver location configurable
This helps in situation where the location of the gdbserver
installation is not under the control of the user and he
also can't tweak path settings on the device.

Change-Id: Iab5bbfef765879bf59930cc416385c692056da93
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-09-13 14:51:12 +02:00
Joerg Bornemann
b865c6e57e CppEditor: more autotests for follow under cursor
Add autotests for follow under cursor for constructors and
destructors.

Task-number: QTCREATORBUG-7485
Change-Id: I43cc12f54b93a582203cd52c1fd61fedf9198e74
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-13 14:48:59 +02:00
Erik Verbruggen
c9f5a14bdd C++: add code-model settings to choose one by mime-type.
The model-manager now supports multiple code models for semantic
highlighting and code completion, and will choose one based on the
mime-type of the editor.

The settings page is currently disabled. It will get enabled when a
second plug-in lands that has a ModelManagerSupport class.

Change-Id: I10023f52322ed6860397da15dba1c231e80e6517
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-13 14:37:48 +02:00
Christian Kandeler
f33d145e64 ProjectExplorer: Fix build.
A plugin's path is not in the list of include paths, and neither should
it be.

Change-Id: I3e0a563b238a6fd55b48807a76c8a10db1d5a527
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-13 14:25:42 +02:00
Christian Kandeler
f4dc469fe1 Android: Fix build with namespaced Qt.
Change-Id: Ie888c2f02e20e866f19854ab621a87e01569b0d5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-13 14:17:56 +02:00
Tobias Hunger
dfbe799590 Utils: Remove dead code
Change-Id: I9e9c7192308630fd85c4ff49120f34dbc8b0c724
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-13 14:08:02 +02:00
hjk
65cc8ae4c2 Core: Clean up FileIconProvider interface
Change-Id: I98c3c8796cb887f5bb3c5184854562ff36727836
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-09-13 14:06:16 +02:00
Daniel Teske
3bb7339fd4 Android: Implement device selection dialog
Change-Id: I1f4f3065a09837414429bbfc68110ada85ea174a
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-09-13 12:34:46 +02:00
hjk
6669e8ea75 KitChooser: Add a 'Manage' button for quick setting access
Change-Id: I0f90075ed6549b1e5093d8cc81975bc46acf38fb
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-13 11:35:43 +02:00
hjk
242ad7e527 Debugger: Remove avoidable platform dependent compilation
Less chance for compile fix ping pong.

Change-Id: I2b055d1a12ba848f86d5246592ed7bb6d06fff51
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-13 11:35:33 +02:00
hjk
8098c085fe Utils: Cleanup of Tooltip interface
Change-Id: If4908e7a5d5ce749ff1e2efc7a026604821737be
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-13 11:35:22 +02:00
hjk
ee574f58d6 QmlDesigner: Adjust StyledOutputPanePlaceHolder to conventions
Change-Id: Ie8945009e49545e8203c3c56068788749269bb30
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-13 11:18:54 +02:00
Tobias Hunger
747b8d48da Debugger: Remove dead code
Change-Id: Id626cd25efec5fd00ccd87fac4de429c9cdabf8b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-13 10:32:01 +02:00
Friedemann Kleint
4f9594ad03 Git Show: Use %n for message and add Linguist comment.
Change-Id: I09af9ea6531af2f768e393f37e28962860b47e5c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-13 10:12:26 +02:00
Orgad Shaneh
d5a1bdc7fb ANSI: Use QCOMPARE instead of QVERIFY
Change-Id: Ia1be4cbf9fc4a5e6b608fbf9aad2679a5aa66f38
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-09-12 20:29:30 +02:00
Orgad Shaneh
61eb23082b ANSI: Simplify escape sequence
Change-Id: I0088a922af7723aabb6751ac80af39467d4cfb0b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-09-12 20:07:40 +02:00
Tobias Hunger
f1f1f65f7c Kits: Simplify handling of sticky kit information
Change-Id: Iff01445d1251487bd44c227de36f1b47ba4c3d42
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-12 18:46:20 +02:00
Christian Kandeler
6e11e56290 Make AnsiEscapeCodeHandler autotest compile with qbs.
Change-Id: I33151bedddf01491a60107f718df8e252ecba301
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-12 18:06:23 +02:00
Joerg Bornemann
fa491c882c CppEditor: make isNamespaceFunction available for all C++ quickfixes
This function is generally useful when dealing with free functions.

Change-Id: I52c0057b587d81c4b0eddac24e4d7659f80cf840
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-12 16:42:31 +02:00
Tobias Hunger
6a352130bc PythonEditor: Remove dead code
Change-Id: I78da9f381ba8081a681f46c045b436e143416206
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-12 16:03:29 +02:00
David Schulz
6bdf99cde9 Utils: Remove unneeded decleration.
seems to be a leftover from Ie791f7b9f1a425325d0b889e73758c5f7f7e6ad2.

Change-Id: I0abdbcdb2a96aa8b7b13ae044846b158cd101be8
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-12 16:01:17 +02:00
Tobias Hunger
abc51caddb valgrind: Remove dead code
Change-Id: If2a8b49e0710ba7620ef0fc99713858b0e4b1310
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-12 16:00:56 +02:00
Friedemann Kleint
1901a1c7d4 Fix MSVC-64 warnings about size_t -> int truncations in C++-lib.
Change-Id: Ibe6f41ac15df1ec685b0d0766ff568abf6f3ae7e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-12 15:34:09 +02:00
Tobias Hunger
5c33742375 CppTools: Remove dead code
Change-Id: I89e544946ff06593cb16badfb39a04f9d22924ef
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-12 13:55:13 +02:00
Tobias Hunger
e7c5f22fb8 Core: Remove dead code
Change-Id: Ia8d85cb54c96fbca09331df6f5ac360100011dab
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-12 13:54:37 +02:00