Commit Graph

57165 Commits

Author SHA1 Message Date
Tobias Hunger
9edd80770e KitManager: Do not create lots of desktop kits
Change-Id: I563e34bc2594f05da35bb723947276f02d5846fc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-12 13:38:23 +00:00
Eike Ziller
98479ba312 Merge remote-tracking branch 'origin/4.7'
Change-Id: I00b0009867322be55c215351054acc7de5b9e335
2018-07-12 14:56:13 +02:00
Ulf Hermann
d7733bafe1 Tracing: Don't rebuild flame graph if there is nothing to see
If the root size is 0, none of the nodes will be visible. Don't create
them in the first place.

Task-number: QTCREATORBUG-20772
Change-Id: I9595daece2d17fe8202b322ffafd361d6fa422fa
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-12 12:53:23 +00:00
Tobias Hunger
c17a1ce249 CMakeTool: Move introspection data into separate class
Change-Id: I53dd2f6f09f164042fe796761678b93f1f99bb75
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-12 12:21:40 +00:00
Christian Stenger
3a4592609c AutoTest: Handle direct usage of quick_test_main
If users need to register additional QML types before Qt5.12
they need to bend the Quick tests magic a bit and use
quick_test_main or quick_test_main_with_setup directly.
The plugin supports something similar for QTest::qExec, so
allow this for Quick tests as well.

Task-number: QTCREATORBUG-20746
Change-Id: I672f8410914c6cc77abc901998f419dda35755ae
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-07-12 11:26:07 +00:00
Tobias Hunger
22568df2e8 ProjectExplorer: Small header cleanup
Change-Id: I110320198363f4d349d709c28bafcefebf9ff267
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-12 11:04:54 +00:00
Tobias Hunger
a33c72a08c KitManager: Remove temporary kit list
Change-Id: I4cf595e8c297040e936d8b4391e6df414828fb1f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-12 10:36:39 +00:00
Eike Ziller
0471fc0f46 Fix assert when filtering examples / tutorials
The examples are put throw two proxy models. The first one implements
the sorting and filtering, the second one transforms the list into a
grid.

The grid proxy model was based on QIdentityProxyModel, which is wrong
because that explicitly states that it should be used when the structure
of the model stays the same.
Even QAbstractProxyModel works under the assumption that all items in
the proxy model correspond to an item in the source model, which is not
true for a N*M grid.

Just implement the proxy model "by hand", making sure that all items
that cannot be mapped to the source are handles correctly as "empty"
items.

Task-number: QTCREATORBUG-20641
Change-Id: Id08b77bb7157b893b9d0d73dc006db98d90032b7
Reviewed-by: hjk <hjk@qt.io>
2018-07-12 10:16:26 +00:00
Tobias Hunger
293e711739 ProjectModel: Fix crash when updating parsing state of project
Fix crash when updating the parsing state of a project during the time
between the project being removed from the session and the time when
the project is actually destroyed.

Change-Id: I54bf4793626497315fe588ebb68474b880de2984
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-12 09:57:49 +00:00
Tobias Hunger
e6cfe06dfc CMake: Fix building on current executable target
Task-number: QTCREATORBUG-20763
Change-Id: Ie25c0993c1c2051de3f6a15fca56b56caaa04b00
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-12 09:57:20 +00:00
Andre Hartmann
2b45a44ee1 FileProperties: Use native separators for file path
Change-Id: I66c9f62b0c48165f5160d117ad3f0cf5e84f686b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-12 09:09:10 +00:00
Eike Ziller
93434cf5d1 Fix that Qt Quick Designer did not request Design mode creation
If you turned off Designer and ScxmlEditor plugins, you'd not get Design
mode even if you have Qt Quick Designer.

Fix-up of 299da01332

Change-Id: Ib3a269db9630af09c36968435ca0b0d998cc1709
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-12 08:51:34 +00:00
Christian Kandeler
c4cc4219cd Update qbs submodule
To HEAD of 1.12 branch.

Change-Id: I3b0115655d3f3735730250a06b96805bc343dee8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-07-12 08:32:40 +00:00
Leena Miettinen
41493d24f0 Doc: Replace title with HTML filename as value of \contentspage
To make links work if the title changes.

Change-Id: Icf516e74c68efc3b26689aaec27f28ee7ae51ce3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-12 08:27:01 +00:00
Tobias Hunger
20ce7887ec ProjectExplorer: Remove margin around Environment KitInformation
Remove margin around the Environment widget of the kit.

Change-Id: I64deee380c404d1bc55f01d25f20a54be3a7afe0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-12 08:26:55 +00:00
Alessandro Portale
ad474f5fcb Fix: member initializer for 'm_fooBar' is redundant
warning: member initializer for 'm_isValid' is redundant
[modernize-use-default-member-init]

Change-Id: Icd521e7d77054512bc0ed6b95cf08440320b0ce0
Reviewed-by: hjk <hjk@qt.io>
2018-07-12 08:19:00 +00:00
Tobias Hunger
8eda99afcb KitManager: Use members directly instead of going through method
Change-Id: I323db88e26a3d614da84f1a85e52c787373ac91c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-12 08:18:29 +00:00
Tobias Hunger
4a062dff13 ProjectExplorer: Make KitManager::kits(...) return an empty list during load
Make KitManager::kits(...) return an empty list during the time a kit is loaded.

Simplify initialization of loading function. It is only triggered in
ProjectExplorerPlugin::delayedInitialize, so that is safe.

Change-Id: I2ed67d881b019b70cdcc23fcc4b0d48d04fa1df6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-12 08:18:16 +00:00
hjk
9ee022af7c BareMetal: Make better use of typed treemodel
Using the right type (Utils::TypedTreeItem<GdbServerProviderNode>) for
the root item avoids the m_widget == nullptr case and enables
simplification of the code.

Change-Id: I20bff4e8ad57551578513d4ffef1f969290a55f9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-12 07:51:27 +00:00
Alessandro Portale
3d3f14e3fe Prefer using 'override' instead of 'virtual'
warning: prefer using 'override' or (rarely) 'final' instead of
'virtual' [modernize-use-override]

Change-Id: I6dac7a62b627fa1353b4455e1af92f869c2571cc
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2018-07-11 16:31:35 +00:00
Christian Stenger
f80aa2c6f7 AutoTest: Fix handling of cpp files for Quick tests
Modifying C++ files of Quick tests had been ignored as they
normally have little impact.
But nevertheless this behavior is wrong and could lead to
unexpected behavior later on if no complete rescan had been
done and even with a rescan there could have been some
cached artifacts.
Fix this by tracking the paths of the C++ files that hold
the main() or the respective macro to be able to handle
changes of these files correctly as well.

Task-number: QTCREATORBUG-20746
Change-Id: Iec860aa63ffd167511efdbf63a6ffa369f094edf
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-07-11 13:18:04 +00:00
Orgad Shaneh
3c8dec2398 QmakePM: Show kit name in compiler mismatch message
Change-Id: Ib5bfd90064c525a7b599434d31ab704e8e110d1a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-11 12:29:47 +00:00
Orgad Shaneh
e4469dbbe2 Clang: Auto-detect multiple versions
Change-Id: I6ec3d9a5038a5e6d958e2f7452717b5af54189eb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-11 12:29:27 +00:00
Orgad Shaneh
d3450a3fa4 GCC: Factor out versionProbe
Will be reused for detection of Clang versions.

Change-Id: Ie34a69b08ea2c16256d748a3d5c96687fa9b806a
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-11 12:29:19 +00:00
Orgad Shaneh
c7ae8a7dab QmakePM: Reduce nesting in QmakeProject::testToolChain
Change-Id: If4e7af104844a0da74dec7e3c8a343b120e7822a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-11 12:26:26 +00:00
Leena Miettinen
f18d2ded9b Doc: Move information about Qt Quick Controls to "Creating Components"
Move the topic up in the hierarchy. Will remove "Creating Screens" in
a follow-up commit.

Change-Id: I0de2bdc4706ab0cce13f5772006126b291e76b97
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-11 12:24:44 +00:00
David Schulz
a30e9e0f9a ProjectExplorer: only add Tasks from the main thread
If something fails while extracting the build env from msvc vavars
scripts we want to add task hub entries to inform the user about a most
probably unusable toolchain. As the msvc toolchain detection is threaded
nowadays and the TaskHub is not thread safe we need to propagate the
error message to the main thread before adding the Task entries.

Change-Id: I5c67d3b8d58b22ea895afb6f22ee73f19fa52f17
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-11 12:15:46 +00:00
Orgad Shaneh
6b701ec6f0 Utils: Follow symlinks in Environment::isSameExecutable
If qmake uses /usr/bin/gcc and the kit is configured to use /usr/bin/gcc-7,
and both reference the same executable, there is no reason to warn.

Change-Id: Ida79fccb97cffb682c1d85d7fa8888d85bf7d6a4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-11 12:15:08 +00:00
Tobias Hunger
1c39d97442 BareMetal: Remove unimplemented method from header
Change-Id: I7006b95f8e13533c727c1001ba72179c1e8c1c10
Reviewed-by: hjk <hjk@qt.io>
2018-07-11 12:09:31 +00:00
Leena Miettinen
33998917c6 Doc: Move information about states to "Adding States"
Now that the states have their own topic, all information
about using states should be found there.

Change-Id: Iab1d17aeca9774e3e4bd3e50c776862aa4697a47
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-11 11:04:09 +00:00
Leena Miettinen
b5686f7f1b Doc: Describe Navigator and Properties in separate topics
To modularize the Qt Quick Designer docs.

Change-Id: Ia0ef0dbd07344375a7f145af16fe949e7807d55f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-11 11:03:55 +00:00
Ivan Donchevskii
c4bc55975b ProjectExplorer: Make manual setup of clang-cl compiler easier
Automatically pick the proper available MSVC script if possible.

Change-Id: I39b0744983f5aa51c3c962afc2622ab21313f30e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-11 10:26:43 +00:00
Ivan Donchevskii
391c68cddc Unit-tests: Fix compilation and failing tests
Change-Id: I061dbd01e3838721e259df619016be1fc66987b0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-11 10:25:47 +00:00
Tobias Hunger
ba70df8be7 CMakeTool: Fix reading from SDKtool file
Change-Id: Ie1efbfe579c8d41ffd0795deaa3ee3759938862b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-11 10:21:20 +00:00
Robert Loehning
e0f8779168 Squish: Update suite_WELP
This is a follow-up to 744279.

Change-Id: I24485972b3a292952c653f2cfab1af198578fcc4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-11 09:25:15 +00:00
Tobias Hunger
7478c4aef1 CMakeTool: Split parsing out of data retrievel methods
Change-Id: I237d90310bc032b7537ab33e0cb181e2163be5a7
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-11 08:30:50 +00:00
Tobias Hunger
942bd5f74b CMake: CMakeTool de-QObject-ification
Change-Id: I7c9dde72b8672be67f6771f98b54b31fa44a9166
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-11 08:30:41 +00:00
Tobias Hunger
673cb63458 ProjectExplorer: Simplify initial default kit selection on load
Do not set a default kit before picking one.

Just set the default kit on load unconditionally, there is none
set yet.

Change-Id: I253ab7f0cec88c95402e5aa783ffa2401c5e5ffd
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-11 08:29:54 +00:00
Tobias Hunger
72b1b3a55a ProjectExplorer: Simplify Kit settings file access
Check for existence of file in one place instead of once per file
we access.

Change-Id: Ie574d5e1e3e3aac97e239b57e94a58d9d3e7d626
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-11 08:29:28 +00:00
Tobias Hunger
05fb67fee7 ProjectExplorer: Use unique_ptr to store KitInformation
Change-Id: I406b6bed005fb7455e6ee41d81a2f314584a051a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-11 08:29:19 +00:00
hjk
6aeb06c8d3 Android: Move CreateAndroidManifestWizard and related build step to base
It does not directly depend on qmake anymore.

Change-Id: I3b9625e54d98c79ef137059cf4554b3f2807e88e
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-07-11 07:45:13 +00:00
hjk
5807cea413 Android: Use generic functions in CreateAndroidManifestwizard
The only really qmake specific one was adding files to a project
node, that's now done using the usual *QtSupport indirection.

Change-Id: Id6f011d4b26eaba1cd3943f0089fc5b913193fb7
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-07-11 07:42:17 +00:00
Eike Ziller
626c08aaa5 Merge "Merge remote-tracking branch 'origin/4.6' into 4.7" into 4.7 2018-07-11 06:27:31 +00:00
David Schulz
28a03360d6 Debugger: add instruction to build python enabled dumper for cdb
Like for the llvm code model additional 3rd party installation is
required to build the python enabled dumper on Windows. Adding minimum
version of Python and the name of the environment variable pointing to
the Python installation to the README.md.

Change-Id: I0cad39a57e4726083fcd44bde8b4c990cbd1ab03
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-11 05:45:49 +00:00
Oswald Buddenhagen
cec5396190 Merge remote-tracking branch 'origin/4.6' into 4.7
Change-Id: Iaeca1396d6057cc92a75f376934edfb03213ebcd
2018-07-10 16:48:55 +02:00
scootergrisen
36def7975d Update danish (da) translation for Qt Creator 4.6
Change-Id: I2633ab242f193aa0aaa79cadba250bd8d9842924
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-07-10 14:00:31 +00:00
Vikas Pachdha
f10002e3f5 Android: Deploy Qt live apk for QML projects
Task-number: QDS-16
Change-Id: Iafb1f7ea5d354e73020ff3c5175efa82f99bdffe
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-10 11:51:44 +00:00
hjk
f07c2f46c4 More changelog for 4.7
Change-Id: Ic32da3de59a1e855d324330d684260ac60eb1eb6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-07-10 11:36:34 +00:00
hjk
18b2865834 ProjectExplorer: Add a BuildConfiguration::regenerateBuildFiles
That's effectively a generic hook for "re-run qmake" without the
qmake/QmakeProjectManager dependency.

Change-Id: I236d40690cde9047831422b2651ed2284b220959
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-10 09:57:55 +00:00
Tim Jenssen
0387fc0f93 use initializer list
Change-Id: I15fdcf313db913df91a1a93684e1d60de7bf16bd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-07-10 09:54:02 +00:00