Commit Graph

61529 Commits

Author SHA1 Message Date
Christian Kandeler
7e82a674ae WorkingDirectoryAspect: Fix UI tab order
Change-Id: Ie70f582a1dcadb5f6d07a37f6ac06e5a4cd8d545
Reviewed-by: hjk <hjk@qt.io>
2019-06-03 12:30:47 +00:00
Anton Danielsson
a154f26af5 Fix AndroidDeployQtStep
Bug was introduced by Utils::CommandLine.
Cased "executable" to be an empty string.

Change-Id: I2b5cd31e3eb1d2d18252dac90de07c053de9f3ce
Reviewed-by: hjk <hjk@qt.io>
2019-06-03 12:13:52 +00:00
Cristian Adam
dfe38f79c3 CMake build: Ensure compilation when Qt5::Script is missing
The Qt5 Visual C++ 2017 64 bit installation doesn't come with Qt5::Script
target by default.

This patch ensures that Qt Creator can be built with the above Qt5 scenario.

Change-Id: Ibe35e9d879ccd51012f53acebfbb7461fd773d4a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-06-03 11:49:13 +00:00
hjk
d1fef0ea51 ProjectExplorer: Add a Runnable::setCommandLine()
Change-Id: I9b6a782e143dca8519cdc57171557bd3893df921
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-03 11:31:53 +00:00
hjk
fa38a31644 CMake: Use Utils::CommandLine for CMakeBuildStep
Change-Id: I0490b1edf073c680f24ad7de10b544443ae62c5e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-03 11:20:39 +00:00
Christian Stenger
884665a0fe Wizards: Fix CppLibrary wizards
Fix wrong string evaluation of boolean values which made
in turn the generated files partially wrong.
Introduced with cb63706f83 (but wrong also before for
the no-Qt-dependency case).

Change-Id: I404534d4b21d0d1c496635adfcd8a73716ba13d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-03 11:08:37 +00:00
Tobias Hunger
08025009a6 CMake: Add missing dependencies to clangrefactoringbackend related code
Change-Id: I4c7fa04309f24a5a5143a5e32f0b5200fdcde0b6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-03 09:43:16 +00:00
Tobias Hunger
d70d58b5cc CMake: Add Threads::Threads as public dependency to clangrefactoringbackend library
Change-Id: If7d3d4a7226f034d0e4c66726d3a7beed3480efe
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-03 09:27:51 +00:00
Eike Ziller
60da2d7c67 Merge remote-tracking branch 'origin/4.10'
Change-Id: I362555983841fa3005f0da7dd790d91c56ea448d
2019-06-03 10:49:11 +02:00
Eike Ziller
e23ebfbd20 Merge remote-tracking branch 'origin/4.9' into 4.10
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Id73301c82c4ba50e0a886e850da2c92bbeed4dc3
2019-06-03 10:46:09 +02:00
Cristian Adam
fb41fb8a20 CMake Build: Add Qt and clang in PATH variable for Windows tests
Windows doesn't have RPATH support, and Qt and clang directories
need to be set into PATH environment variable for tests to be able
to run.

On my work machine I had the directories set into the global PATH
environment.

Change-Id: I91e0adc5999479e7dcf3cf0a734ed31e6edc402f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-03 08:34:19 +00:00
hjk
4742216feb Core: Give a hint why saving of settings are requested
Not all requests are the same, handling code might want to act
differently on different request reasons.

Main driver here is the handling of the debugger/analyzer main window
state savings which depends on actual visibility of certain windows.

Change-Id: I87b2a9149e3d09d27bc14b44aace9f2e0686db04
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-03 08:25:41 +00:00
Eike Ziller
23c222f61b Fix C++ Library wizard when compiled with Qt < 5.12
Only Qt 5.12 got true ECMA Script capabilities, so arrow function
expressions are not supported before that.

To be able to use "regular" inline functions, we allow usage of } by escaping with backslash.
For variables that do not start with "JS:" we already supported backslash for escaping.

Fixes: QTCREATORBUG-22336
Change-Id: I9fc638e64d2757a21fffc16355635e2fcff87a36
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-03 06:46:52 +00:00
Christian Stenger
d73c271259 sdktool: Adapt tests
The names for registered Qt, cmake and toolchain must
no more be unique.
Amends e9e4c27e3a.

Change-Id: Icea00636f3632148f209616de3473816e12e4655
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-03 05:55:32 +00:00
Orgad Shaneh
1ef76e3dd7 CMake: Fix relative tools path
Run in terminal was broken because qtcreator_process_stub was looked up in
the wrong place.

Change-Id: If6219f06b1081a4e5e41a72a6fb001fd95d77184
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-31 08:23:16 +00:00
Tobias Hunger
ec63e5fd98 CMake: Use extend_qtc_plugin in SilverSearcher
Change-Id: Iaf9b490151aea61e25b59a83c8a16d19f837482b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-31 07:28:09 +00:00
Anton Danielsson
93a1364b05 Fix incorrect assignment of qml-root-path
Change-Id: I958427e7fdfd721c90cac52a33dbb17b0f3fdc1c
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2019-05-31 06:46:29 +00:00
Orgad Shaneh
b500119fd7 CMake: Support building a single file
Fixes: QTCREATORBUG-18898
Change-Id: I0ec24b20bfa8d43093b6e6681ddd752fbdea2088
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-05-29 20:09:24 +00:00
hjk
a7345b67c1 ProjectExplorer/Android: Some more use of Utils::CommandLine
And surrounding cosmetics.

Change-Id: Iad3d2d43856b1fcd9530d4a209fff9887e6cec42
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-29 16:49:47 +00:00
hjk
bc82e3cc74 Qbs: Simplify QbsBuildConfig::equivalentCommandLine implementation
Change-Id: I49cf90eb495537e52ad955546510d1df067c0e14
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-29 16:06:16 +00:00
hjk
0e0a8e9204 WinRt: Use new Utils::CommandLine
Change-Id: I7320f92199af439225233b6a1bcf0ec0b185cdcb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-29 14:43:36 +00:00
hjk
4098be05b2 Utils: Extract a CommandLine structure from a QtcProcess
We regularly pass around strings or filenames or pairs of strings
or filenames and stringlist etc the in the end will be used
as a kind of "command line", with quite a bit of ad-hoc user
code and QtcProcess::addArg etc to set them up and manipulate them.

Let's have a class for that concept.

Change-Id: I288ab939d853b32c717135a65242c584c2beab50
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-29 14:36:46 +00:00
Thomas Hartmann
df22fb083b QmlDesigner: Fix crash
Task-number: QDS-778
Change-Id: I808238e3123c4020b0fb4a7ef4e41dd95756c58a
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
qds/v1.2.0
2019-05-29 13:59:53 +00:00
Cristian Adam
f50859e856 CMake build: Add unittest CMake build files
On MinGW 8.1 I get the following after running ctest -j 40

99% tests passed, 35 tests failed out of 2631

Change-Id: I2c3ce7940b036e52ef393feab5837886355e7b5a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-05-29 13:46:25 +00:00
Eike Ziller
0bbc5ef574 CMake build: Add option for disabling build of executable
So the package build can later easily separate sdktool and windows
debugging helpers etc.
Add a extend_qtc_executable similar to extend_qtc_plugin

Change-Id: Ie790e86e12b0fed41c912e8205a273ac857f3854
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-05-29 13:26:35 +00:00
Christian Kandeler
0a88ad3c27 Core: Make names of OutputWindowPrivate members consistent
Change-Id: Ie17dd3c2da711b59c0ca9a5c4a5b88bde21612e2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-29 13:18:41 +00:00
Christian Kandeler
5bbed92061 ProjectExplorer: Allow text filtering in message pane
Change-Id: I7b70f7056c757fcb13634021b8e2dcf0b3a34097
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-29 12:57:31 +00:00
Christian Kandeler
51afb04674 ProjectExplorer: Allow text filtering in compile output pane
Change-Id: Ibd5c20e5d5dbbb1867aefc8d701218469b3a427b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-29 12:57:14 +00:00
Christian Kandeler
7c82e241af Update qbs submodule
To HEAD of master branch.

Change-Id: Ia9d319fef40f9c0e0b258590f3c04c8bfe3bc9ea
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-05-29 12:50:40 +00:00
Christian Stenger
75b501be9d Debugger: Revive long lost tab titles
Tab titles of the application output pane for attach
to running and unstarted applications had been present
a long time ago.

Change-Id: I0a4f18438bef967ad60c447c81d58fec6aa830ae
Reviewed-by: hjk <hjk@qt.io>
2019-05-29 11:23:25 +00:00
Christian Stenger
5261892fc5 Debugger: Avoid having an empty tab title when attaching to core
Change-Id: I7327ef6f350fbff3c1beffe51c65d7ce708caae0
Reviewed-by: hjk <hjk@qt.io>
2019-05-29 11:23:11 +00:00
Alessandro Portale
948c149bc7 ProjectExplorer: Avoid redundant regexp matches
The number of compiler name filters (per gcc-like compiler) is supposed
to be 6 instead of 19.

Change-Id: I215ea45411bd14d3595d059df4bd4ac1bc88c214
Reviewed-by: hjk <hjk@qt.io>
2019-05-29 10:44:48 +00:00
hjk
bac812ad57 Core: FilePath-ify ReadOnlyFilesDialog
Change-Id: Iccde7e5cfcee0bdb02720279e8a310857c0a7a67
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-05-29 07:13:57 +00:00
hjk
243be2250a Core: Avoid implicit QFileInfo creation
Change-Id: I371b6a2b308eab17a67c67015e0cdcbd632059c5
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-05-29 05:43:31 +00:00
Christian Stenger
6505799c44 Squish: Remove unused functions
Change-Id: If53390d65b9013c42f7dcf5834b4caee2bcb8766
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-05-29 04:48:26 +00:00
Christian Stenger
83f37d0838 Squish: Remove unused files
Change-Id: I2c88692fa941ff4e34eb7e2a2ecf729771e7afca
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-05-29 04:48:07 +00:00
hjk
35fa8aa802 Fix projectupdater-test.cpp after FileName changes
Change-Id: I43974405522facd46a757ba4cf2886128310597c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 16:49:29 +00:00
hjk
42d7d3123a QmakeProjectManager: Remove dead code
Change-Id: Ib0cf30c9aa9dce6e55fbdb914cf0bfd4a539496f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 16:04:20 +00:00
Alessandro Portale
0933c20de8 connect() to ambiguous signals/slots: Replace static_cast with QOverload
Change-Id: I473d7a2a16509cee944a2a21b022a3f6f02cfd8d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 14:07:03 +00:00
hjk
1b11c4d4b6 Utils: Fix a few strings after FileName renaming
Change-Id: I2c7f8d3ececeb9d505ce1cee1591d41604b3505c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-28 14:06:18 +00:00
hjk
613d2e7d23 Utils: Remove rarely used FilePath constructor
Not much benefit interface-wise.

Change-Id: I0e605ec235e8072efcbf7e777cf7e8f8ee5e0799
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-28 14:05:51 +00:00
Tim Jenssen
38f8a7a6b1 add QTDS doc used image folders to dev packages
Change-Id: I06b38d9b66833ee161728e7dfad2e11a5afd4f81
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-28 12:36:54 +00:00
hjk
473a741c9f Utils: Rename FileName to FilePath
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 12:23:26 +00:00
Eike Ziller
e0355ff835 Bump version to 4.9.2
Change-Id: I29e0f3c2e5f4569b2a23961b6980740501915cb3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-28 12:12:05 +00:00
Eike Ziller
4704f49fbb Merge remote-tracking branch 'origin/4.9'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
	src/plugins/qmldesigner/qmldesignerextension/timelineeditor/preseteditor.cpp
	src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp
	src/shared/qbs

Change-Id: I369368de9b9c682b03e224d489589043e1f6782b
2019-05-28 14:01:01 +02:00
hjk
93dfbad97b QmakeProject: Use QString mkspec in QmakeKitInformation
... and BaseQtVersion, and QmakeBuildConfiguration.

Change-Id: Iac5f768b80a7f8c2ea9a37d099b285d5793270db
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 11:16:57 +00:00
Eike Ziller
28c2a618a2 CMake build: Add missing test dependency
Change-Id: I5ba945e5ceb0fc680c5e768ec1797f2a9356f70a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-05-28 11:15:42 +00:00
Eike Ziller
9989406106 CMake build: Fix qtc_extend_plugin if plugin is disabled by CONDITION
It should be a no-op in that case, but still error if the plugin target
name passed to qtc_extend_plugin is wrong.

Change-Id: I97579e658d4b42108fbc2600aad550c6a7b7f11b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-05-28 11:15:22 +00:00
hjk
cc877949ca ProjectExplorer: (Re-)start using strings for mkspecs
Even if this is part of a directory name it is naturally closer to a
"string" id than a file path.

Change-Id: If66f930526744379ce86e2b18bd9eac7fabfe773
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 11:12:00 +00:00
hjk
774d2063d0 ProjectExplorer: Use the new way for dependent aspects
... for WorkingDirectory aspects.

Change-Id: Idf64f1daeb74a70637bb983db1b45f0132cfc299
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 10:48:02 +00:00