Commit Graph

54723 Commits

Author SHA1 Message Date
Laurent Montel
21d07f0ed4 Clean forward declaration
Change-Id: I1935221134b168c3bfdba334265a299d82283ba3
Reviewed-by: hjk <hjk@qt.io>
2017-09-26 12:49:32 +00:00
Eike Ziller
3a5bb4e32c Merge remote-tracking branch 'origin/master' into 4.5
Change-Id: Iaf279b5cf8f4cd417c87eb633f22efbe510ac31d
2017-09-26 14:45:12 +02:00
Thomas Hartmann
b81396c36e QmlDesigner: Fix compile
Did not compile with GCC 5.3 because frames and frames()
are ambiguous.
The new function name is more descriptive.

Change-Id: I832a02fb56dbada07dc8622b566762fb32139d3f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-26 12:19:53 +00:00
Thomas Hartmann
272645d790 QmlDesigner: Add default for DesignerSettingsKey::STATESEDITOR_EXPANDED
Change-Id: Iace28338f1cd67d0adb5bc0f573028f9fa030b38
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-09-26 12:19:44 +00:00
Thomas Hartmann
8e1af07c11 QmlDesigner: Add option in navigator to show only visible items
At the moment we show everything in default properties including
non visible items. This is a bad default.
Instead we provide an option if only visible items or all
objects are shown in the navigator.

Change-Id: I65b58d949136bcce4b06f1f47f56fb0f210fed5c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-26 12:19:33 +00:00
hjk
f3afac128b ClangStaticAnalyzer: Avoid use of DummyRunConfigurations
This moves the explicit build step into a dependent runWorker,
making the whole setup more aligned with a normal tool run.

Change-Id: Icd01b2e82f7f95774434d2ede04d08a5311b64e7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-09-26 11:19:40 +00:00
Eike Ziller
f5f4ebff73 Update project names in file system navigation pane
When the project reports a change in the display name we need to update
the drop down in the file system navigation pane as well.

Task-number: QTCREATORBUG-18972
Change-Id: Icfc0e6b2185f147bfc36589d8aea13a0966e8793
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-26 11:03:41 +00:00
Eike Ziller
f292a5e45b Add projects directory to folder navigation widget
Change-Id: Ia925fa99ba0f11be860f214e7809731ddf990268
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-26 11:03:31 +00:00
Eike Ziller
716808d9fd Add Home folder to file system view
Change-Id: I580475e06dafe835512d078fec30f59d4e798438
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-26 11:03:24 +00:00
Eike Ziller
08aa833825 Sort root directories in file system view
Change-Id: I8ce68ffa4752c89de735583640103bc22c2a8bc7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-26 11:03:16 +00:00
Robert Loehning
cf370d5305 Squish: Update debugger tests
The used project looks a little different now.

Change-Id: I786749a4aae5d2ceaff0d2fc65aedf41c04a66f2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-26 10:25:49 +00:00
Christian Kandeler
b70637de41 QbsProjectManager: Fix project parsing
Some recent ProjectExplorer refactorings caused the projects to stay
in the parsing state indefinitely, making it impossible to build or
run anything.

Change-Id: I458a5560cc8d0c7c3183c0f104f00b073039f28e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-26 10:22:18 +00:00
Ulf Hermann
05ef571922 QmlProfiler: 20s are still not enough for LocalQmlProfilerRunnerTest
The test has failed again because of insufficient timeout. 22s would
have been enough this time ...

Change-Id: I001a921921997863d77af8483403a8bd8a85eb29
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-09-26 09:35:56 +00:00
Marco Bubke
1005fa9b68 Clang: Initialize HighlightingTypes to Invalid
It is too easy to forget to initialize the type, so it can have a wrong
value. Actually we should use exceptions elsewhere because this can be
simply hiding bugs.

Change-Id: I71c0b467c12409b489c173e3edc53cdaa406bf09
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-26 09:12:50 +00:00
Eike Ziller
653e1e18c1 Dev package: Include .hpp files
Like optional.hpp

Change-Id: I1cc804834f34982dedfae0597179e523ff3bf522
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-26 08:15:04 +00:00
Christian Stenger
1e8d030284 AutoTest: Ask for runnable if determination failed
There are several complex project layouts that lead to failing
to determine the correct runnable for tests.
If this happens prompt the user for the runnable to use instead
of performing wild guesses or blindly using a wrong one.

Task-number: QTCREATORBUG-17882
Task-number: QTCREATORBUG-18922
Task-number: QTCREATORBUG-18932
Change-Id: I1575f310c450e56c087f1e689d0fc7dfb0cd0bef
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2017-09-26 07:33:32 +00:00
Christian Stenger
9dc8b54cdb AutoTest: Early return if fail to get local executable
If we have not found a local executable any further processing
is not necessary as the outcome will be the same: we will not
be able to start the test runnable.

Change-Id: Iaa4bbd533ced6184148f941c1cba394f9f47554d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2017-09-26 07:01:04 +00:00
Christian Stenger
090dea66ee AutoTest: Use single build target as fallback
If we cannot find the respective build target to execute
tests, but we only have a single build target then
we now assume that this will be the right one.

Change-Id: I0f7c3c4f371bce3a7f328e7c28dc61cadf7f6e9e
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2017-09-26 07:00:57 +00:00
Christian Stenger
3c602b32d4 AutoTest: Try harder to find relevant build targets
If there are tests defined or registered inside libraries
we ended up trying to execute the library or nothing at all.
If possible try to find correct build targets for such cases.

Change-Id: I58e9edb7f858e3e5407ece6fcb8782f5a129acd0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-09-26 07:00:48 +00:00
Christian Stenger
fb063a09be AutoTest: Be more correct when gathering buildsystem targets
This avoids taking too many buildsystem targets into account. On the
downside this breaks execution of several possible project layouts.

Change-Id: Ia7bf00d11a3e7c9bf362667e33b1d1542495db4a
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2017-09-26 07:00:38 +00:00
Laurent Montel
3f4a434dea ResourceEditor: Clean forward declaration
Change-Id: I4bdf81b30b4b9c04f53ea2d11e56eec94821a15b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-26 06:49:02 +00:00
Christian Stenger
cd4218f85a QmlDesigner: Fix compile for gcc 4.9
Change-Id: I7ec825c7c719d46524358d45bec3a93072112cac
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-26 06:35:43 +00:00
hjk
295d3d7170 Debugger: Avoid use of dummy RunConfigurations
Allow to rely on kit plus data directly specified in the dialogs.

This means, RunControls with nullptr RunConfigurations are allowed
again.

Change-Id: I0b574b397603c0520c8187a8967bff2cf5e20ae8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-26 06:29:31 +00:00
Orgad Shaneh
ec4269f6a1 BareMetal: Fix target file name resolving
Broke by 1acd9d30dc.

Change-Id: I0dbf14aeb345743eb22a033ac3570c6af4eb0bb2
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-26 03:38:23 +00:00
Orgad Shaneh
91dd6ee0f9 Debugger: Fix crash when shutting down during core initialization
GDB output is still processed, but the docks are already deleted.

Use asynchronous shutdown, and wait for engine termination before deleting
the main window.

Change-Id: I28a36de15a0e9ce08ae18412d97aaf13cb0c25a6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-25 17:57:19 +00:00
Orgad Shaneh
f65ddad8b5 Merge remote-tracking branch 'origin/4.5' into master
Change-Id: I9bd98c02519e3798c0ef58cdf758222e546620fb
2017-09-25 20:19:56 +03:00
Orgad Shaneh
8ad4d4be6a Merge remote-tracking branch 'origin/master' into 4.5
Change-Id: I9fff4705cd5a7c92ddb18318cd87d0fe6f263f7e
2017-09-25 20:17:42 +03:00
Laurent Montel
631718bfba ClearCase: Clean forward declaration
Change-Id: I1b54d3e4eeeb301c0ce06086b5f14d2efc510525
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-25 17:15:55 +00:00
Thomas Hartmann
5e95553c5c QmlDesigner: Check if we are actually in a state
Mapping the QmlPropertyChanges back to the item makes
only sense if we are in a state.

Change-Id: I47d7a8810b3f920b53bc73eb21980c8abd04c572
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-09-25 14:46:16 +00:00
Thomas Hartmann
0521b7e1ef QmlDesigner: Implement model support for timeline
This patch implements the basic support for the timelien in the
model.
The type names will most likely change.

Change-Id: Ib3161d480468cf88e9f155130f7cba70451a8c7e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-25 14:45:53 +00:00
Ivan Donchevskii
ad62b1e022 EditorManager: move all openEditor functions to one place
Remove code duplication for openEditor function that
gets search result as a parameter.

Change-Id: I3eb1c41b8a0fda3b2e8a4929cef1d5924295f1f5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-25 14:26:12 +00:00
Thomas Hartmann
34a4c60da3 QmlDesigner: Ignore property without node location
This means that the node was created during this transaction
and the correct value will be set when creating the node.

Change-Id: Ie70df3c9156f8958c099bd49551f3dc42d815e25
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-25 12:10:06 +00:00
Thomas Hartmann
64a1401919 QmlDesigner: Fix notifications
In case we did a mapping to PropertyChanges
we notified the change on the ProperyChange
instead of the target item.

Change-Id: I876a998589cddd16e4968fd1dd0eebaab42863dc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-25 12:09:58 +00:00
Friedemann Kleint
ede5e0c586 Environment::value(): Use findKey() helper
Also change path() to use value() so that "Path" as used on Windows
will be found as well.

Task-number: QTCREATORBUG-18958
Change-Id: Ie930f6a6e71c76459cf9d089c225f5b1adf52433
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-25 11:47:05 +00:00
Tobias Hunger
83210400b1 Benchmarks: Provide infrastructure for benchmarks
... and use it for the profiling report.

Instantiate a Utils::Benchmarker(...) to report a data point (which
will be created at destruction time, reporting the live-time of the
object).

Alternatively you can use Utils::Benchmarker::report(...) to record
your data point.

Independent of how you create a datapoint, it will be reported through
the qtc.benchmark logging category and can get pushed to a database
from a script parsing creator's output.

Note: The plugin-loading uses the existing -profiling infrastructure,
so you need to start Creator with -profile to see data points.

Change-Id: I18e6b84137d0f49ee5e12e7c3d75323005ce5a29
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-25 11:33:29 +00:00
Orgad Shaneh
3924d3deac UnitTest: Fix build with clang 3.9.1
llvm-config-3.9 --cxxflags has -g1 which is substituted by 1.

Change-Id: I626f3f15c659f7de030c08883b5b739b1d636ada
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-09-25 11:32:41 +00:00
Nikolai Kosjar
3c219903de Clang: Fix clang version extracting also for git
\w did not match the '-' in "5.0.1git-81029f14223".

Change-Id: I5f8d8110b93ac3efed2ec903504f86833cc32aa7
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-09-25 11:31:14 +00:00
Nikolai Kosjar
92693b9ac9 Clang: Remove unused messages
Change-Id: Ibe2678de726a867308fac16c6a14b0eff10cbacb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-25 11:27:12 +00:00
Friedemann Kleint
0c1bb6d913 VcsBaseClientSettings: Skip empty parts when splitting paths
Change-Id: I56106079a31ec0ebc64a038ca41df618b0c09fcf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-25 09:51:03 +00:00
Robert Loehning
5b94c3730b Squish: Update tst_SCOM02
...for changed QML file in project template.

Change-Id: I3a0999650bffc35bc09d0f8ae92a33b80ac90474
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-25 09:33:26 +00:00
Nikolai Kosjar
810ba37075 Clang: Fix build with older clang
Change-Id: Iafe2f706f90ecce236bc2b3b602b55491df19f94
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-25 09:15:37 +00:00
Eike Ziller
b19ea09e25 Merge remote-tracking branch 'origin/master' into 4.5
Change-Id: I20eb743180b51dbedabced277a8f12ebe9620807
2017-09-25 11:03:45 +02:00
Eike Ziller
cfdea6b9c2 Merge remote-tracking branch 'origin/4.4'
Change-Id: I7bf72444b19db20fcc7dc2c9d1f02ec2b30b658f
2017-09-25 11:00:25 +02:00
Orgad Shaneh
75f13f200b Utils: Fix comment in optional.h
Change-Id: I082c939469d0161d5ed5f9da810bd6b553750ce0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-25 08:45:17 +00:00
Nikolai Kosjar
40ba7ac16f CppEditor: Avoid blocking context menu invocation
Show the menu always immediately.

If the needed use selections are not up to date for the refactoring
actions, then trigger an async run and if that one finishes, then update
the refactoring menu. In the meanwhile, show a place holder menu item
showing on-going progress (Utils::ProgressIndicator).

Change-Id: Iae7ab37738d79c20aeb1ccda2b1781091e90fdc3
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-25 07:20:58 +00:00
hjk
b21742b464 Valgrind: Merge memcheck{engine,tool}.* files
This is purely mechanical in preparation of moving some
per-run items from the MemCheckTool singleton to
MemCheckToolRunner.

Change-Id: I0fcaf6e90b2d63ca8f3c3eb7130ed73ed494f35b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-25 06:55:32 +00:00
Orgad Shaneh
fb39de6a78 Android: Remove outdated condition
Before e57ed31c33 the path was retrieved from
the root project node. In that commit this was changed and it is now read
from the Id.

Remove the argument and always read the path from id.

Also de-duplicate pathFromId.

Change-Id: I6aeef1106bc101ecb130f2c2ccb7226bfc7d0903
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-09-25 05:48:24 +00:00
Tobias Hunger
357c27e651 Project: Make subscribeSignal handle signals with Parameters
Change-Id: Ic685da344f7bdf201daf9156ce48c87ced04e023
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-24 16:39:56 +00:00
Tobias Hunger
98862af779 QMake: Improve following of links in .pro/.pri files
* Activate on all characters of $$PWD, and not just on the PWD part
* Handle $${PWD} (also on all characters)

Task-number: QTCREATORBUG-18719
Change-Id: I52db23a671cc78ca4fcaa8a6905bba48b1ecd91b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-24 16:39:43 +00:00
Claus Steuer
100cd10d6e CMake: Set CMakeRunConfiguration executable and working directory
Since 131c7a1 the executable and base working directory property of
CMakeRunConfiguration objects is no longer set when the project data
is updated. At least the executable is required in the AutoTest plugin.

Change-Id: I31c4cb37983d3983664d178c0f8c08d491f719ad
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-24 12:23:45 +00:00