Commit Graph

69528 Commits

Author SHA1 Message Date
Tim Jenssen 22a87fdd95 qmlpuppet: adjust to api changes in Qt 6.2
Change-Id: I3c9139cacb7ff9eb7b8138e0a7f589280a24c13a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-07 17:40:26 +00:00
Tim Jenssen 4c878e5700 smallstring: Avoid size_t to (u)int warning
Change-Id: If206f0e3a90694b4e0d50e2d4569e0d6a34cf8ce
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-07 17:40:04 +00:00
Tim Jenssen 59ac4dbf0d fix msvc Qt6 dev builds
Change-Id: I4264a15c5033b9123c4e97caa86a909e654cef34
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-07 17:39:56 +00:00
Tim Jenssen 40d03d1896 Avoid size_t to (u)int warnings with auto, where it is possible
Change-Id: I1ec7454ebce59d99bc828bfd5086907eb0905632
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-07 17:39:46 +00:00
Eike Ziller cd84331848 CMake build: Fix workaround for new *Private targets with CMake < 3.18
Amends a803d04c17

Change-Id: I2df067d988a79845f4a9f85485c13e5e2f8019dc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-07 14:07:06 +00:00
Leena Miettinen 42141fed26 Doc: Describe "MCU dependencies" option in Kit options
Task-number: QTCREATORBUG-25642
Change-Id: I9b4be0682381dc886487b4c70d8bc9e79d8620b5
Reviewed-by: Erik Verbruggen <erik.verbruggen@me.com>
2021-07-07 13:52:44 +00:00
hjk d7062b5b92 Utils: Allow additional directories for FilePath::searchInPath
This mimics Environment::searchInPath().

Change-Id: I8c772ed31c31c74b09c7aa0e4912de8586dd2468
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-07 10:43:46 +00:00
Orgad Shaneh d2aa0f4ed9 Git: Fix regression on cherry-pick
Amends commit 55f768e1b0.

Fixes: QTCREATORBUG-25975
Change-Id: Ie49b64f777bd7155cc226b70c0c473a5ac1ce282
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-07-07 10:16:54 +00:00
Robert Löhning e065107fa5 QmlJSTools: Guard against null pointer access
Fixes: QTCREATORBUG-25943
Change-Id: If9e6528b0dc5642dbd150e7d20aeb9347f3d4465
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Erik Verbruggen <erik.verbruggen@me.com>
v5.0.0-beta1
2021-07-07 09:45:52 +00:00
Leena Miettinen 916fc90b44 Doc: Describe Show Source and Header Groups filter in Projects view
Task-number: QTCREATORBUG-25642
Change-Id: Ic3243d0be5c15e1ff853b52271ba31e3c3b148b4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-07-07 09:03:20 +00:00
Eike Ziller 0df677f7ac AutoTest: Guard simultaneous access to header cache
It is accessed from multiple threads at once. Guard with mutex to avoid
crashes.

Amends 64ce2a6f43

Change-Id: I5048e5fcdb27b2492656b302775378829b6da013
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-07 08:45:59 +00:00
Eike Ziller 434c33f4ee Update changes file for 5.0
Change-Id: Ibbe0661d3ce1c5ff6a624e7908a996a3ad9e187a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-07-07 07:36:31 +00:00
Leena Miettinen 93be13bfc1 Doc: Describe new GDB options
Task-number: QTCREATORBUG-25642
Change-Id: I32b5d9bffd0eab2dbc1f6afd1f05be149fe1a10e
Reviewed-by: hjk <hjk@qt.io>
2021-07-07 07:33:14 +00:00
hjk eb70e20453 Utils: Add a FilePath::environment
A hook into the system environment of the FilePath's device.

Change-Id: I274032f9e716f3cd8b2e4af2eca010b9805a4568
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-07 07:22:30 +00:00
Eike Ziller 1d05a2b5af Merge remote-tracking branch 'origin/5.0'
Change-Id: Icea9215204a7247c5fbbc818833132676a3b9e11
2021-07-06 16:00:14 +02:00
hjk 4eec360563 Utils: Remove one ProcessArgs::expandMacros overload
Only used once.

Also allow logging of expansion failures.

Change-Id: I357ed6ed28fe379d482358c46b495bc727f86902
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-06 11:36:09 +00:00
Orgad Shaneh 86df204bad Git: Fix regression in log output on Windows
Current path appeared instead of the committer date.

This is probably due to the changes in handling commands. The command has
%cD%Creset. %cD% is interpreted as current directory, unless escaped.

Change-Id: Id564c338dc1f4d882e4449430000b7dcebdd7288
Reviewed-by: hjk <hjk@qt.io>
2021-07-06 08:09:05 +00:00
hjk 7a6c099c08 Nim: Use remote device when searching compilers there
Change-Id: Iab1cb1dbaaf789d2ad328ab70c3dec8839d4ffcc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-06 07:35:56 +00:00
hjk 10ca1c711e Docker: Partially split out kit item autodetection
Most of it is independent of the docker device as such, this should be
centralized somehow. This here is a first step.

Change-Id: If32063559a4c7c6c3cecf1973e1ef1f634e5f8f4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-06 06:46:13 +00:00
David Schulz 5d33982513 LSP: reload semantic token if we encounter corrupted data
Change-Id: I73185b0b7be57d348fc1a461b1db0383313d7208
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-06 04:58:50 +00:00
Tim Jenssen e4376e6b3d QmlDesigner: QtTest is a better check
QtQuick.2 was moved to QtQuick in Qt6

Task-number: QDS-4661
Change-Id: I514fcb51c2b46dbef5cc9af79672abc3e86ebbbc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-05 19:40:50 +00:00
hjk 1e11f3eade ProjectExplorer: Introduce DeviceManager::defaultDesktopDevice()
Just syntactic sugar to make doing the right thing less painful.

Change-Id: Ia51cda20e5395925215f226b9a379af66fddfd8b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-07-05 16:00:47 +00:00
Christian Kandeler 2e9604c092 Utils: Do not save file upon PersistentSettingsWriter destruction
The m_savedData member is set on two occasions: Once directly after
reading the same file that is going to be written, and once directly
after a successful file save. In neither case do we have to write it out
again.

Fixes: QTCREATORBUG-25921
Change-Id: Ie369e280f4189aefb6b2ad291426ee9e6f1ed16d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-07-05 15:46:06 +00:00
Christian Kandeler 8cc4bbe4d8 ClangFormat: Prepend a space character to our inserted line comment
Otherwise, we could introduce unwanted syntactical constructs, for
instance if the previous character is an asterisk.

Fixes: QTCREATORBUG-25966
Change-Id: Ic0b535861bc1cb4f5f93d06bb11d0f3c7c583893
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-07-05 15:44:51 +00:00
Orgad Shaneh dcf692d3ff CMake build: Purge copying settings from Nokia directory
It is not used, and not supported in the other build systems.

Change-Id: I38049e145595490058e255b94cdb8dd13c3f6fb2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-07-05 14:36:25 +00:00
Eike Ziller dbb5ab932c CMake build: Don't re-link libraries unnecessarily
If a library changes its implementation only, don't relink all
libraries that depend on it. This is usually not necessary since the
API stayed the same.

Fixes: QTCREATORBUG-25962
Change-Id: I0221b09afd92463c3dad40bd0107ba0d5668ac79
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-07-05 13:23:01 +00:00
Tim Jenssen 2eef40bb85 qmldesigner: fix error output at puppet crashes
Change-Id: I6c2a8d655e996e6f935d069a97a45e64ad0ef5b9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-07-05 13:05:02 +00:00
hjk fd71cbf135 Docker: Properly map back DockerDevice::directoryEntries() result
Even though the file is accessible in the local path, not mapping
back loses its relation do the docker container used for further
decisions like FilePath::needsDevice().

Change-Id: I7c693d604364b9e42bf7310c072be0f33d149626
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-05 13:00:16 +00:00
Marco Bubke b1fcc4b7a0 QmlDesigner: Relink alias properties
There are still some corner cases but this will be done in follow-up
patches. The link information moved to the typenames table so only
indirections are saved in the propertyDeclarations table. Otherwise
the duplication would increase the database size too much.

Task-number: QDS-4551
Change-Id: I4aca85dd2d803b43aa9860183e500ced2d91141f
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-05 12:40:49 +00:00
Leena Miettinen 100c5f5c26 Doc: Update screenshot of text editor color schemes
The code elements for which users can define colors are not
listed in the docs, but the updated screenshot shows the new
parameters setting.

Task-number: QTCREATORBUG-25642
Change-Id: I5cd640b85f16d3bcd8be9c4b61f93c0da80c3d98
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-07-05 11:28:55 +00:00
Christian Kandeler de2c26f7f5 ClangFormat: Prevent adding/removing lines when indenting
In indentation-only mode, any edit that adds or removes newlines is
wrong by definition.

Change-Id: Ida6e729f4d5e8dcd7893fb2bb9407e596661f942
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-05 11:26:20 +00:00
Christian Kandeler f248d0a737 ClangFormat: Add xfailing unit test
Task-number: QTCREATORBUG-25966
Change-Id: If8f28bd5195f2681cca209b41bcc93fad0695541
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-05 11:26:09 +00:00
Robert Löhning 770182653c Squish: Add parentheses around all print statements
Required by Python 3.

Change-Id: Ia28491882a844d3642da38145b1ebfcfbd5883b3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-05 10:31:19 +00:00
Marco Bubke 8f4a06664f UnitTests: Update to google test 1.11
The new version improves the mocking support quite a lot.

Change-Id: Ia59513ad251a084f8baca8178d9d5a9079bd63ef
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-07-05 10:28:57 +00:00
Robert Löhning c8b176c9a7 Squish: Stabilize tst_HELP02
On Windows, the shortcut gets lost when
clicking "Stop Recording" too quickly.

Change-Id: Ieb89b7f59ded0792bf09fbad0b4b44a78d369c0f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-05 09:25:31 +00:00
Orgad Shaneh 84839ee397 Merge remote-tracking branch 'origin/5.0'
Change-Id: Ia018600fb257c9523fc9d15faa5bd8300840e3de
2021-07-05 12:17:45 +03:00
Eike Ziller 21115ae511 Keep "Build All Projects" the first item
like it was before the re-arrangement.

Amends 3bd490acdb

Fixes: QTCREATORBUG-25948
Change-Id: Ia4bd97c95d2976cd52bfcbd40389f6c7360c8109
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-07-05 08:55:00 +00:00
Eike Ziller e3b639047f Don't update extra compilers individually after project load
Each call of CppModelManager::updateSourceFiles detaches the current
snapshot.
The extra compilers where set up and triggered individually, and
resulted in individual updateSourceFiles calls with the single result
file of the extra compiler. For Qt Creator this would lead to 200
calls in quick succession after project load, potentially leading to a
freeze of multiple seconds.

Instead of updating the result files of the extra compilers individually
after project load, integrate the update into the regular project source
file update. So we end up with only a single call of updateSourceFiles.
For this the project updater needs to trigger the extra compilers, and
wait for all to finish as well as the regular project part update,
before
triggering the parser.

Task-number: QTCREATORBUG-25783
Change-Id: I34f6df0fc0f96bcb42ee65019bee39cf49176c1f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-07-05 08:16:25 +00:00
Christian Kandeler 68846a7729 ClangCodeModel: Provide highlighting via clangd
Note that we lose the highlighting for virtual function calls. We need
to amend clangd to add the respective information to its semantic tokens
message.
Also, Qt properties are no longer highlighted as class members. We'll
investigate how to best restore this feature.

Change-Id: I403712aada3d7a8e1c7b7c1277f43f7f64f8450b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-07-05 07:39:06 +00:00
Christian Kandeler 32f46e55ed CppTools: Move ProjectPartChooser tests into the plugin
Change-Id: Ic2ef95d4d6a5bd65cbc611b66a0b297c7468bbcb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-05 07:38:10 +00:00
Leena Miettinen db053c49ad Python: Fix UI text
Task-number: QTCREATORBUG-25915
Change-Id: I4f317e9bf091bd68fc6d76ded9e5db4d989c71cb
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-07-05 06:35:44 +00:00
Leena Miettinen 0727bc5c79 Text Editor: Fix UI text
Task-number: QTCREATORBUG-25915
Change-Id: Ibc760268640ee77d8c2f95f92fee46f46408f75d
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-07-05 06:35:31 +00:00
Leena Miettinen c9e89d4844 MCU: Fix UI text
Task-number: QTCREATORBUG-25915
Change-Id: Ia6505f1ec0fd8ebb879ca21e1b3bf140db9e9538
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2021-07-05 06:35:12 +00:00
hjk 9a82846de4 ClangTools: Use FilePath in ClangToolRunner::init()
One .path().path() less.

Change-Id: Ibf1b25acefafc1bb5359d839ebf272c3d1fb08d6
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-07-05 06:06:45 +00:00
hjk 579e643f71 Debugger: Increase the default string display limit to 300
This helps especially with paths that often exceed 100 characters
nowadays.

Change-Id: I0a4cd62803178a129e8ced723e5422bf9eb21a08
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-05 05:31:05 +00:00
Cristian Adam 3a503a7eb0 QmlPuppet: Builds fix for Qt5
Amends 7c0652b7ac

Change-Id: I55792a5468b5cf7e9eedb6a105abe468c48ecd2d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-07-02 18:44:22 +00:00
Henning Gruendl 0f77cf9077 QmlDesigner: Update states editor error message
Task-number: QTCREATORBUG-25630
Change-Id: I255666a3ed4f162af0a579a6f7daa9e28487dd1d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-02 15:39:36 +00:00
Alessandro Portale f43ac65ccb Don't call qt_add_qml_module with inexistent TARGET
If the passed TARGET does not exist (because it had been disabled in the
CMake configuration), qt_add_qml_module will create it for the user.
That created target is by itself incomplete and breaks the build.

So, don't call qt_add_qml_module with inexistent TARGET.

Fixes: QTCREATORBUG-25960
Change-Id: I646eb2176befb0fd5fe06e184ebd0cee32e18ab2
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-07-02 15:35:24 +00:00
Leena Miettinen baf222af3f Doc: Describe creating QRC and RCC files
Fixes: QDS-4566
Change-Id: I1a1e95e64f5196776d2205d66d59120e8d3412d7
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2021-07-02 14:18:11 +00:00
Mahmoud Badri ca23fa4359 QmlDesigner: Remove space at the top of the assets lib
Now hidden section header doesn't occupy space.

Change-Id: Ied4e9ee3c7601c291383f73337e98cb7ffd77f54
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-07-02 14:15:43 +00:00