Commit Graph

54723 Commits

Author SHA1 Message Date
Tobias Hunger
2bc872e6b0 BuildConfiguration: Fix caching of environment
Task-number: QTCREATORBUG-19371
Change-Id: I5ab20cd39d18283d0bd9e5c24db69e7ddba387b9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-28 10:50:49 +00:00
Nikolay Shalakin
4f8905fe83 fix some missing breaks in switches
Change-Id: I8cc269d9a622b4af090795e40e11205d1190248b
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-28 09:54:12 +00:00
Nikolay Shalakin
171adfcfc9 QmlJsImport: correct ImportMatchStrength comparison
Change-Id: I9aa775dc23d19e856e38baf9834bedb6903800a9
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-28 09:53:47 +00:00
Nikolay Shalakin
54498da3b4 avoid crash during Android Virtual Device Manager launch
Change-Id: I9d496fd8e6b976f2cdfe891139475636ad3be018
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-28 09:53:06 +00:00
Christian Stenger
e412a800b0 AutoTest: Limit search for test tree items to respective root
If searching for a test tree item matching a QtTestResult
we can safely limit searching to the subtree holding
QtTests or QuickTests.
Additionally store information whether it is a Quick or
pure Qt test into the result to limit it to a single root.

Change-Id: I240e778448d99434d188d90a110dfa4f1934c950
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-11-28 09:40:47 +00:00
Christian Stenger
eaf4b67461 Tests: Fix compile on Linux and Windows
Change-Id: Ie8db68769a2419c9ad8700d9eef1d4093c209d9b
Reviewed-by: hjk <hjk@qt.io>
2017-11-28 08:47:39 +00:00
Nikolay Shalakin
1cf2d2942c python scanner: fix "oct" and "chr" highlight
a missing comma defeated both keywords.

Change-Id: I2486ca5ca7d82d7ddcab8656b02fba0b3f54ddd8
Reviewed-by: hjk <hjk@qt.io>
2017-11-27 19:24:58 +00:00
hjk
d282a0708f RemoteLinux: Restrict remote custom exe runconfig to remote case
It was accidentally showing up for the desktop case, too.

Change-Id: I3baa354b83bec93866af5f31699ccc7d8a2fe3c7
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-11-27 15:13:19 +00:00
Tobias Hunger
86d074123a ProjectExplorer: Fix build failure on windows
Task-number: QTCREATORBUG-19368
Change-Id: I4464b4f9b2f1a2d725f5a08fb6e38444fabcdea5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-27 15:00:24 +00:00
Tobias Hunger
566b118a87 Utils: Make algorithms take more containers
Change-Id: I05bd1052bbc2c6481fdec8a3763d9ae4f3dc8f44
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-27 15:00:16 +00:00
Tobias Hunger
750493a0eb QmakeAndroidSupport: Fix warnings
Change-Id: Ic302ab4978f7a00a9119a4e9214c040b7cf1e0ba
Reviewed-by: hjk <hjk@qt.io>
2017-11-27 14:59:53 +00:00
Tobias Hunger
85af11ccc9 ClangRefactoring: Fix warning about missing override
Change-Id: I85d2e789e9e078dafc76c7da46849d8e87fbd2a7
Reviewed-by: hjk <hjk@qt.io>
2017-11-27 14:59:37 +00:00
Alessandro Portale
8895ef1ddb Utils: Add a manual test for Utils::CrumblePath
Using a small test app for testing the CrumblePath is less clumsy than
doing that in Qt Quick Designer.

Change-Id: I4a1d739aa303adfd799df33eb00fb8cd513304c3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-27 14:07:40 +00:00
Ivan Donchevskii
8efb598e60 TextEditor: move Link class to separate header in Utils
Link is a common class and is used across the plugins.

Change-Id: Id92e47e1b8604316ca8b970804e57abaf404ec28
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-11-27 13:57:02 +00:00
Christian Stenger
1914481a30 Tests: Disable test for LLDB
Change-Id: I1f7a576d3b8feb527013e3b679fc60c4e663f2eb
Reviewed-by: hjk <hjk@qt.io>
2017-11-27 12:48:42 +00:00
Christian Stenger
b0cbed9a17 Dumper: Do not use enumHexDisplay unconditionally
This function is available only for GDB. When using CDB or LLDB
this ends up in an exception.

Change-Id: Ie1835c1b95cac99e3f996077f6a3d80b5591c145
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-11-27 12:48:26 +00:00
Nikolai Kosjar
16ca76d8f5 Clang: Fix future reporting on backend crash
...otherwise CppUseSelectionsUpdater might block for an infinite
duration.

Change-Id: I756d82499b0b2864363dcaeff15398a8bf5500d9
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-11-27 12:47:38 +00:00
hjk
f686dec480 BareMetal: Remove BareMetalRunConfigurationFactory::canCreateHelper
Was unneeded and forgotten to remove in the recent RunConfiguration
refactoring.

Change-Id: I8032ce576d2afe7841c77a39f2719ee7a6ec0de7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-27 12:22:55 +00:00
Eike Ziller
8e1fefd8de Merge remote-tracking branch 'origin/4.5'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I29979e76cb01bc94ddcd7868ca1cbc34afb14c5d
2017-11-27 12:46:56 +01:00
Orgad Shaneh
63861c44c1 DiffEditor: Fix parsing of mode-only change in patch
If one of the files has mode-only change, the entire patch
fails as a git patch, and is parsed as a text patch.

Because of that, the prefixes (a/, b/) are not stripped and
jumping to a change by double-clicking does not work.

Change-Id: Ib54ce4fa7aad02cb956af1f7de73d3c732ac5a89
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2017-11-27 11:40:31 +00:00
Christian Kandeler
8bc3ac9177 Update qbs submodule
To HEAD of 1.10 branch.

Change-Id: I4d73b84f845cccc0363673100681c74f51dd695a
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-11-27 09:49:07 +00:00
hjk
23ccfc4b36 Utils: Delay saving of treeview column sizes while resizing
As discussed in the linked report, QSettings behavior was changed to
aggressively attempt to sync on each ::setValue() call, therefore causing
excessive disk thrashing when used regularly.

This is arguably a regression on the QSettings side, specifically as the
documentation suggests some kind of delay and therefore merging of quick
sequences of setValue calls (as implemented previously), but since this
opinion is not generally shared, Qt applications need to implement that
behavior now by themselves.

This patch here does that for the reported case in Creator (and uses the
opportunity to delay to 2 secs, which should be sufficient for the case)

Change-Id: I04af0cd1a042abcf7113b5dde5c36e0338f7acb3
Task-number: QTCREATORBUG-15594
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-27 09:48:09 +00:00
Tobias Hunger
dfcd573427 Qmake: Do not crash when closing a project while it is parsing
* Fix crashes and resource leaks in qmake project.

Task-number: QTCREATORBUG-19358
Change-Id: I3b383640cdf994b4014ccbfc4278be48f9e5fd3f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-11-27 09:16:54 +00:00
hjk
1697f97aff ProjectExplorer: Register createes' base id in RunConfigurationFactory
This shifts the resposibility of creation/splitting of RunConfiguration
ids into what are essentially "type ids" and "build targets" to the base
implementation, possibly opening the path of abandoning the mangled ids
in favor of explicitly storing their constituent parts.

Take advantage of base id split in RunConfigurations for availableIds
/displayNameForId and for canCreate/canRestore/canClone.

Change-Id: I19fefb32757407ab5053a2ae0e5a79438659f6ec
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
2017-11-27 07:23:17 +00:00
Tobias Hunger
dbd365afe6 Kit: Allow for Macros in EnvironmentKitInformation
Task-number: QTCREATORBUG-19359
Change-Id: I215fcbb6156f864176d7a8284371029e3ae62e92
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-24 17:52:52 +00:00
Eike Ziller
cf781640cf Fix that double-click in file system view sometimes does not work
When clicking on an item that changes the height of the crumble path, a
double-click has great chances of not succeeding, because before the
second click, the item might move away from under the mouse.

If the tree has a scroll bar that can move wide enough, we solve that by
scrolling the tree such that the same item remains under cursor when the
crumble path height changes. (We have to synchronize the scroll bar
value change with the relayouting though, to avoid flicker.)

If there is no scroll bar, or it cannot move enough in the needed
direction, we delay the re-layouting by the maximum double-click
interval to guarantee a double-click will still have the same item under
the mouse.

Change-Id: I3b296925d9be2d2ab5affbbb64df67173d9715d4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-11-24 12:51:44 +00:00
Eike Ziller
92a91a38f6 Bump version
Change-Id: Ie823825b9dd4092f9997716790bfc3fbe138dd46
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-24 11:00:03 +00:00
Tobias Hunger
9dcf8cf0ed ProjectExplorer: Remove useless newlines in output of ApplicationLauncher
Those will be added anyway.

Change-Id: I7b1f4b1b7bc0f5f0128989dfdbb4c436fd9b60c1
Reviewed-by: hjk <hjk@qt.io>
2017-11-24 10:24:33 +00:00
Tobias Hunger
58fd29e0ed ProjectExplorer: Do not add too many newlines
Do not add newlines when output gets flushed.

Task-number: QTCREATORBUG-17403
Change-Id: I0dea3a15611fcde8aa8cbc5fbc6b7f22c9c40dd7
Reviewed-by: hjk <hjk@qt.io>
2017-11-24 10:23:51 +00:00
Eike Ziller
4c8db5e9b7 Merge remote-tracking branch 'origin/4.5'
Change-Id: I32715e2fdbb14e4fccc4c58d3fd6052d7c1127f3
2017-11-24 10:03:38 +01:00
Orgad Shaneh
b43e22b8f4 CppTools: Disable Qt keywords for C files
Task-number: QTCREATORBUG-1478
Change-Id: I29afc0f38e5f86ca2c30d5b6551974df68ee7512
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-11-24 08:43:27 +00:00
Orgad Shaneh
ec86bf8ca6 CppTools: Fix initial macro parsing for generic project
The extra macros in the config files are being read in
CppModelManager::internalDefinedMacros(), but they also affect the language
features in ProjectPart::updateLanguageFeatures().

Task-number: QTCREATORBUG-1478
Change-Id: Ic197b0b7d4cc6e6a74637da0c710b0630daae25c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-11-24 08:40:56 +00:00
Ulf Hermann
283069f4af Doc: Update perf profiler documentation
Numerous things have changed in the perf profiler since this was last
edited.

Change-Id: I5443b526fc203ecc506401343b90c81038869f62
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-11-23 15:40:35 +00:00
Tobias Hunger
3b86d90266 CMake: Add QT_INSTALL_BINS to PATH on windows
Add QT_INSTALL_BINS to PATH on windows in the CMake RunConfiguration.

This should fix cmake applications using Qt not being able to get
started after they were built.

Unfortunately this patch is not a great solution: This should be configurable,
similar to the "Add libraries to LD_LIBRARY_PATH" checkbox we have for other
OSes and build systems. Such a change is unfortunately not acceptable at this
stage of the 4.5 branch though.

Task-number: QTCREATORBUG-19354
Change-Id: Ic2d568d965e41e3eb875fed8c2e5dd2ba15d2db1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-23 15:00:58 +00:00
Marco Bubke
3f12a33bcb UnitTests: Remove duplicate
Change-Id: I5c409cce070a9f02515750139fd87b44d734979f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-23 12:45:31 +00:00
Thomas Hartmann
76c1041dc9 QmlDesigner: Add support for requesting types of frames
Change-Id: I3262887682520f521e84eacc26a6708d3d09b233
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-11-23 11:56:51 +00:00
Marco Bubke
a15250051d Clang: Handle native file in the file cache
Different types are introduced for normalized and native file path. So the
compiler is warning you if you try the wrong format.

Change-Id: I1da0686b142cbf9bb7578468c2b50f90a94cebf9
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-23 11:55:15 +00:00
Marco Bubke
bb2f9574b4 Utils: Add simple LineColumn class
There are many places where line and column are returned by writable
parameters which is not so readable. This simple class makes it easier
to return line and column as one value.

Change-Id: I4836088e76d0ee5decd713ab616fde2f8a97c74b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-23 11:33:56 +00:00
Ulf Hermann
b2c2c7d642 QmlProjectManager: Detect file types correctly
Just calling everything "Source" is not very helpful.

Change-Id: I74a19e46782aa301c5726130200aeb16ef916d78
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-11-23 11:15:27 +00:00
Thomas Hartmann
f6068c9fd4 QmlDesigner: Add constants for live preview
Change-Id: I9b0987508ada8f973fbcb52403a3fb38c92ec2ef
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-23 09:40:27 +00:00
Ulf Hermann
3446c0dbd8 Remove accidentally committed fuzzing artifact
Change-Id: I1b9369f68613ab36c57890692e636a15c33ce035
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-23 08:16:35 +00:00
Ivan Donchevskii
7fb80595b9 ClangRefactoring: use sourceUsagesAt instead of locationsAt
Change-Id: I085b243b6e0ea4b786ce5c5f5a6894345f9d87eb
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-11-23 07:17:57 +00:00
Christian Stenger
327b368ab6 QmlProfiler: Fix compile on Windows
Change-Id: I4910a1f8cb36e1cfee6feeef20def6dbc967b66c
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-11-23 06:17:22 +00:00
Tobias Hunger
440f65b115 SettingsAccessor: Factor out basic load/save behavior
Change-Id: I654321167c623b507a9f109e42f77f41df3eccd2
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-11-22 19:12:32 +00:00
hjk
8e8890abc8 QbsProject: Compute uniqueProductName on the fly
To simplify and fix cloning.

Change-Id: I380834710243f104635628b8d455219f0f73e67b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-11-22 15:46:15 +00:00
Ulf Hermann
7b4b56c336 QmlProfiler: Tests for QmlProfilerTraceClient
We run a number of test traces through the trace client and make sure
that it doesn't crash and that the events reappear in the right order.

Change-Id: I45bbeeb978f2ab147551aaafa74631f927c710e8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-11-22 15:10:53 +00:00
Nikolai Kosjar
defe77c7ac Clang: Remove warning about unused parameter
Change-Id: I75481c1f256dbb70de088a7d2289bde9579d3ff4
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-22 14:03:23 +00:00
Nikolai Kosjar
807ef044bf Clang: Remove unused function
Change-Id: Ia76e8cf523b301865d902a3768439a648c23da01
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-22 14:02:40 +00:00
Christian Stenger
2ab27c0842 CppTools: Fix compile with Qt5.6 and gcc4.9
Change-Id: I47668b784106c78444869595143ec8aff6928e8f
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-11-22 13:55:59 +00:00
Christian Stenger
c2e92d3925 Tests: Fix compile with Qt5.6 + gcc4.9
Change-Id: Ic8d6c660cf4d5d185642dcad52753b4da9e70120
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-11-22 13:39:40 +00:00