Commit Graph

44349 Commits

Author SHA1 Message Date
Tobias Hunger
38b21ad04d CMake: Report version information on cmake tool
Improve data retrieval from cmake while at it.

Change-Id: I0329804b800bb9c3b7e734246f795cfd6ae361fe
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 07:27:50 +00:00
Tobias Hunger
8d608d2a74 CMake: Add method to query server mode support to CMakeTool
Change-Id: I88ce643749d2d8f801b20a2c6d7555348292af94
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 07:27:38 +00:00
Tobias Hunger
3ef11019e2 CMake: Parse Generators out of new cmake -E capabilities output
Makes for way more robust (and featureful) generator discovery.

Change-Id: I7df837500e1c3a200960e9d157b5c105dacd4068
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 07:27:25 +00:00
Tobias Hunger
b3b6cfb5ef CMake: Improve generator selection in kits
Allow to select generator and extragenerator in a nicer way.
Enable support for platforms and toolsets.

Change-Id: I0c9aae635cdca0ec1db7f285e9cb2785172ed338
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 07:27:14 +00:00
Tobias Hunger
4bce0d7c36 CMake: Use generator arguments, not generator
Generator is only part of the picture now that the extraGenerator
is separate. Use CMakeGeneratorKitInformation::generatorArguments
instead, that is always the complete thing.

Change-Id: Ifb6238397e70b36e2dc1b145d3dfad1afa2caa3f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-30 07:26:15 +00:00
Tobias Hunger
e21df69354 CMake: Handle more information on the generator being used in a kit
Change-Id: I5834fdfa04b91beb7a61fa897209391c7fcf7d74
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 07:26:06 +00:00
David Schulz
530be10612 Cdb: Improve command logging
For easier copy pasting comands from the log.

Change-Id: I60e2737540d403454cd36f42e7b1ac3cf203df07
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-30 04:59:18 +00:00
Christian Kandeler
47379011ea QbsProjectManager: Take Project::FilesMode into account
Change-Id: Ia3b56392c6334beb0e892adf952c0f752920d704
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-09-29 13:53:27 +00:00
Orgad Shaneh
d452f84930 Debugger: Fix double-click handling in Threads view
Change-Id: I3fb9b6ba6abcdfdf15a45b59e6500a979c40e7d0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-29 13:45:57 +00:00
Tobias Hunger
dbca4488ae CMake: Add a helper method to split a ;-separated list
Add a helper method to split a ;-separated list cmake-style.

Change-Id: I334c31109f442f48a22e91e32b3d810882d6682e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-29 13:36:11 +00:00
Thomas Hartmann
5e1debe9f4 QmlDesigner: Adding support for QML_DESIGNER_IMPORT_PATH in .pro file
The user can set QML_DESIGNER_IMPORT_PATH to define
a qml import path just for qml2puppet.

Change-Id: Ic9dac4cf478c9d0f8d6e066d6a9a481500cc5497
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-29 13:19:03 +00:00
Christian Stenger
b0bf07c64a AutoTest: Modernize code a bit
Change-Id: Ie56f6e5cb8a4f1962bd8df5e57214911ae609921
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-29 12:27:14 +00:00
Christian Stenger
8b579fca6a AutoTest: Remove unneeded method
We can completely rely on what is done in the base class.

Change-Id: I93b04d4de0d104b55db77c4791eec5a5ff20d621
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-29 12:14:03 +00:00
Christian Stenger
6797d8ccd4 AutoTest: Remove left-over declaration
Forgotten in 7f89df16a2.

Change-Id: I2275fa0772d3c014ae1ed672461040c7f621b193
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-29 12:13:57 +00:00
Christian Stenger
013ab29415 AutoTest: Fix retrieving metrics information
Change-Id: Ic0a1e1fbf8db613d0d6b20532a3ef404f625e7b1
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-29 12:13:38 +00:00
Eike Ziller
a47ad71b60 Fix that editor actions were disabled in navigation bar in debug mode
The mode widget needs the editor manager context, not only the debugger
main window.

Task-number: QTCREATORBUG-16543
Change-Id: Ibe92043a374d9fd507e62998f67c0ce897b198e7
Reviewed-by: hjk <hjk@qt.io>
2016-09-29 09:58:12 +00:00
Alessandro Portale
6380b7f5e1 ScxmlEditor: Inline the MainWidget ui creation
Mostly in order to be able to use Core::MiniSplitter

Change-Id: Ief552560b8daa52716d50ee7507a7dcb6bab099b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-29 09:06:53 +00:00
Alessandro Portale
7bbebdeb48 ProjectExplorer: Icon for enabling kits in the project mode
Disabled kit icon plus small "+" overlay.

Change-Id: I58df0da662baf9977382733e8d003766bd232281
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-29 07:25:16 +00:00
Alessandro Portale
7261276d0a ProjectExplorer: Show kit icons in the Project mode tree
Kits have nice icons. Why not show them?

Change-Id: I67fa4ff0217d4262dabd2c9817ddbacc365bb8af
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-29 07:24:53 +00:00
hjk
06b362dcec ProjectWindow: Don't show icons in project combobox
Change-Id: I5438ebbcea598a6972fad1f89ab9ac4ee1ba67aa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-29 06:51:29 +00:00
Christian Kandeler
9e6d470c3a QbsProjectManager: Do not execute rules on initial project loading
The "rule execution only" type of build can lead to nasty bugs due to
scanners getting called for files that don't exist yet.
This effectively reverts a57e75884e.

Task-number: QBS-1021
Change-Id: I85e7559060112428f8cd5872b95619ac26979743
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-09-29 05:33:45 +00:00
Christian Kandeler
b491a1c2c0 QbsProjectManager: Fix typo in toolchain setup code
This lead to weird behavior regarding compiler name and toolchain
prefix.

Task-number: QBS-1022
Change-Id: I10abfb22ee71aed6ec5ebc6b3eb477536c86f717
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-09-29 05:31:13 +00:00
Alessandro Portale
d21d03cff0 Android: Update the SDK download links
Change-Id: Ie83263543b49154a568a8b216d3dfbd87b9902c4
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-28 21:13:42 +00:00
hjk
14d3e89b7d ProjectWindow: Move Project combobox back from top bar
Better discoverable.

Change-Id: Ifae3311b566fc5e5e8b05f2b39abf1520aefde48
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-28 15:24:30 +00:00
Alessandro Portale
7fa66d9e8e Utils: Set the BaseTreeView default icon size to 16
Most of our icons are 16x16px, let's not squeeze them.

Change-Id: I5070b904ded95fcb76c44b0ec430302331d0fe64
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-28 14:52:04 +00:00
Thomas Hartmann
18817a9a74 QmlDesigner: set QT_QUICK_CONTROLS_CONF
If we have a qtquickcontrols2.conf we set QT_QUICK_CONTROLS_CONF
for the qml2puppet.

For this we have to forward the project to PuppetCreator.
I forwarded the project instead of just the path to qtquickcontrols2.conf,
because we most likely add more project specific features in the future.

Change-Id: I0a90636ca6903e28499018c8d769bb07f7be5bb6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-28 14:33:42 +00:00
Alessandro Portale
43afc5d1ad Utils: Remove the shadow from the non-toolbar PLUS icon
Change-Id: If5de4265689770b97661d9da42dd001f55b31b37
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-28 14:15:57 +00:00
Alessandro Portale
058cb8cb87 ProjectExplorer: Fix clang code model warnings
Change-Id: Ife041b5d09365f8a9e0f6ce9fc3736bbd2b66797
Reviewed-by: hjk <hjk@qt.io>
2016-09-28 14:14:24 +00:00
Alessandro Portale
47cf89d461 ProjectExplorer: Show kit icons in kitmanagerconfigwidget
Our kits have nice icons. Why not show them?

Change-Id: I053861225151a34690bf5247be04cc6165b2ac3a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-28 14:14:13 +00:00
Tim Jenssen
1ab28ec954 Sessions: fix rename session
Is a regression from last refactoring.

Change-Id: Ic46cc9a4a449c281371e5dabf732bcc753ef642c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-28 11:16:21 +00:00
Marco Benelli
54a04e68b9 QmlJs: qmlplugindump working directory
Use the plugin's parent path as working directory for the qmlplugindump
process.  This should be more reliable with regards to paths that
include symbolic links to shared or remote volumes.
Using the plugin's parent path will also be needed in order to handle
relative paths passed to the dumper (ie: with the -dependencies
option). This feature is not yet implemented in QtCreator.

Change-Id: I9c863a95d03fc7d03c84e704e39f2e0520aaa01e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-28 10:53:42 +00:00
Alessandro Portale
40d7399755 Help: Small improvements for System Info dialog
1) Make the font non-proportional, since qtDiag's output is formatted
with spaces
2) Make the dialog a window with maximize buttons
3) Fix the formatting for unloaded plugins

Change-Id: I911871b1ffc9dceebcbb04f544cc6d580b95c54e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-28 09:39:29 +00:00
Marco Bubke
e24eb97969 TextEditor: Relative colors
We introduce relative colors to make it possible to change for
example the color of a declaration slightly.

Change-Id: I8c1991a8907207d3616be954504c68ea18c6deb1
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-28 09:10:35 +00:00
Alessandro Portale
d005306d6c ProjectExplorer: Themable device status indicator overlay
Change-Id: I84ddd10a53e709cd57422ab323abdfb69d75c9a6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-27 16:34:46 +00:00
hjk
a2c83874d3 Debugger: Some dumper improvements for QV4 types
Start displaying QV4::Value again for numeric values
and QJSValue for ints, doubles and strings.

Change-Id: I18ce226c21168087ce280cb05aa0e250bd3187d9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2016-09-27 15:20:25 +00:00
Tim Jenssen
02c43d8a42 ClangBackend: speedup qgetenv calls
Change-Id: I2968380064154844a8115413d3ebdcdb5748f254
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-09-27 14:50:43 +00:00
Alessandro Portale
ee6b19cb39 Themable, HighDpi Android/iOS device icons
Also used as option category icons

Change-Id: I40916ff4683554a3e7de7126d737286eba4a525f
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-27 14:18:04 +00:00
Tim Jenssen
de41e85c3b Sessions: select created session
This was a regression after refactoring the session dialog.

Change-Id: I891b037d512a70a591f32e0ca5e0f801799ce424
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-27 13:35:55 +00:00
Christian Stenger
3e5966cff0 AutoTest: Add some logging for time measuring
Change-Id: I31b8ff6edf5c4bd0469da9e32a20dc9b73c46158
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-27 12:59:53 +00:00
Christian Stenger
e9869abfd5 AutoTest: Fix stopping progress animation on cancel
Sometimes the progress indicator did not stop its animation
when parsing for tests was canceled.

Change-Id: I0e4896f2b391ce6690d079fb8b33972cc5fb07f3
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-27 12:59:48 +00:00
Tobias Hunger
2431b7f4a2 CMake: Use final for KitInformation specializations
Change-Id: Ifb2f30f86d1ba1d6ee89db1660d74872c6dcf35c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-27 12:45:49 +00:00
Alessandro Portale
ef208bf8a4 ScxmlEditor: Remove duplicated icons
Some of the icons that came with the scxml editor were already present
elsewhere in Qt Creator in a themable/HighDPI-able form.

Remove the own .png files, use the existing icons.

Change-Id: I891305faee45eeb39dac4135d2ff96fc06727731
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-27 12:34:10 +00:00
Eike Ziller
75abb5e7c3 Merge remote-tracking branch 'origin/4.0' into 4.1
Change-Id: If651b6a5fddcdec5ce62a195448a30152a01fca6
2016-09-27 12:11:11 +02:00
Tobias Hunger
3f3a43a4af CMake: Polish cmaketool a bit
Change-Id: I576197bec6e48decd5e2b4befd156ea985822835
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-27 10:06:50 +00:00
Tobias Hunger
5478be7676 CMake: Report cmake version
Report cmake version in CMakeTool options page.

Task-number: QTCREATORBUG-16089
Change-Id: I506f87bd7037394dc46e9772305c9f909bcc3548
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-27 08:48:28 +00:00
Christian Kandeler
52b6855b4f QmlDesigner: Fix qbs build
Change-Id: Id223698c9bee65b717c03bc9f024d21cff6c5758
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-27 08:46:47 +00:00
Christian Kandeler
9a9442d18d AppManager: Fix qbs build
Change-Id: I5589ed2591ca56591f9fc933778dc6be8f9f8363
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-27 08:39:45 +00:00
Ulf Hermann
2689383fd3 QmlProfiler: Fix flame graph model test
The flame graph keeps separate "flames" for compile and other QML/JS
events now. The test has to be adapted to check for this.

Change-Id: Ifdbc3331240d30a3acbb9df62a6a44654466273e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-27 08:30:47 +00:00
Christian Stenger
d9b7f7010d BareMetal: Fix Qbs build
Broke with 59e7528360.

Change-Id: I5ba5e3ebda53fc4d2083af0871367dd4aca227c5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-09-27 06:45:43 +00:00
Alessandro Portale
8ce4c8b47b KitManagerConfigWidget::resetIcon() avoid empty icon
Do not manually reset the tool button icon. kitUpdated() takes care of
it.

Change-Id: I1bd6ec42a300add6b3a4b60c4fb22cc07ab70d1c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-26 16:18:05 +00:00