Commit Graph

85691 Commits

Author SHA1 Message Date
Jarek Kobus
72118e018e CompilationDbParser: Make parseProject() static
Don't operate on the same CompilationDbParser instance
in the main and the separate threads.
Pass needed data as parseProject's arguments.

Change-Id: Idf5e5d92727d5a279256673088880e6d2f48a7c1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-10-06 15:27:55 +00:00
Jarek Kobus
fbe23282fc AndroidDeviceManager: Execute avd removal in main thread
Instead of executing it blocking in a separate thread.

Change-Id: I0d847f22917edc9782467f173728c13287844acb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-06 15:27:28 +00:00
Cristian Adam
162f9f59d7 CMakePM: print newline before the message
This way we'll get:
  [cmake]
  [cmake] Elapsed time: 00:05.

And not the other way around.

Change-Id: Ica7352cd112b9017c8a39b98618be69494527be9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-06 15:25:48 +00:00
Jarek Kobus
d6f2a73c81 CppIndexingSupport: Pass params to parse() with const ref
Change-Id: Ia54ea81907963e55047f2a5a2a283fd928fdfc2e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-06 13:55:01 +00:00
Jarek Kobus
e8da3b5119 CompilationDataBaseUtils: Pass arg via const ref
Change-Id: I6374b0064249a4574ed77e6c9ae4bca3122878c5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-10-06 13:54:47 +00:00
hjk
db0091e6a3 QMakeProjectManager: Use more common operator==() implementation
Change-Id: I623b49b92913e2f813554b664b3c79683c3a35cf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-10-06 13:32:36 +00:00
hjk
436b215bce QmakeProjectManager: Remove unused arch detection remains
As the comment from f3418d8661 indicated.

Change-Id: I0735130b5162fc7d2bacf8ba7c5fd968f030e67e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-10-06 12:05:57 +00:00
Eike Ziller
ec46988fb7 Disable output view actions if they are not applicable
In Qt Creator the output views are always accessible: The status bar
shows their buttons, and if an output view is opened in a mode that
doesn't have an OutputPanePlaceHolder (which defines the location), the
edit mode is opened.

This is not the case in Design Studio: The status bar is different, and
design mode can only be opened with an open project, so e.g. after
startup in the welcome screen the output view actions should be
disabled.

Achieve that by disabling the actions when the output view buttons in
the status bar are not shown and the current mode doesn't have an
OutputPanePlaceHolder.

Amends 4642c5fd7d
and 3befa60970

Change-Id: I57b9ce3f80006fc2e842e38e93f1f7b50c5749f1
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-10-06 11:57:29 +00:00
Christian Kandeler
b09f4ac1b6 Update qbs submodule to HEAD of 2.2 branch
Change-Id: I652a2ec439f2c05eee79431cef9cbf961e94b37c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-10-06 11:51:35 +00:00
hjk
687dfea03b RemoteLinux: Rename rscyncdeploystep.* to genericdeploystep.*
Change-Id: Ia1a3a18690fb1f3301e97a628ebe3d20568871eb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-10-06 11:49:48 +00:00
Christian Stenger
248ac4a658 SquishTests: Adapt to moved menu item
Change-Id: Ib8df3f315b3e82b5ac4cc81f1347db801de994ff
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-06 11:46:31 +00:00
Christian Stenger
c45ab95400 SquishTests: Fix finding line edit on wizard
Change-Id: I75059b7e302b1e54b8ac78357f631ca2fd15269a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-06 11:46:26 +00:00
Jarek Kobus
509249cac6 CppIndexingSupport: Make some functions static
Change-Id: Id91e4e88e65d706f8dc555896631b79b3159f31d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-10-06 11:40:49 +00:00
Jarek Kobus
0cdced6914 CompilationDbParser: Make readExtraFiles() static
Make a local variable const.

Change-Id: I9befa9e9714bc6b3bf3f524c64880ad1bf9400d6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-10-06 11:40:35 +00:00
hjk
5b8b585d04 RemoteLinux: Rename RsyncDeployStep into GenericDeployStep
It's handling several options nowadays.

Change-Id: Iee599489521c7cb6fa7ec5e28739f7a5ef9bbd8e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-06 11:15:25 +00:00
hjk
1700355534 RemoteLinux: Try better wording for upload options
The actual deploy method is not really fixed until the step starts
running.

Task-number: QTCREATORBUG-29710
Change-Id: Ide4f76b1270f1e998dfac516ae101ddf6f4cebed
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-10-06 11:11:07 +00:00
Christian Kandeler
9c60801653 CppEditor: Use a _data() function for the "move def to decl" tests
Change-Id: I4da6aa383da82b968d371a8b74acee1fc7e8bef1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-10-06 11:01:19 +00:00
hjk
449f622942 ProjectExplorer: Allow more than one sub-row for tasks
Amends a475632c66.

The sub-entries are not uniform.

Change-Id: I6660d3a45a973ac5c5037b8bf0974a6da563e8c8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-10-06 10:51:52 +00:00
Christian Kandeler
6b3cf966bc QbsProjectManager: Fix restoring custom build properties
Amends d6fe357d81.

Change-Id: Icdc59c5ead49621854906ed94528c98ddc78433b
Reviewed-by: hjk <hjk@qt.io>
2023-10-06 10:26:36 +00:00
Ali Kianian
3dcfd9335b QmlDesigner: Fix the bug for filtering csv files
Change-Id: I932ab0e297aee37e58c910790fdfb72ac8e430fb
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-10-06 10:07:15 +00:00
Thomas Hartmann
793323cc16 QmlDesigner: Add .qad filter to project template
Task-number: QDS-10815
Change-Id: I5a83e27197f33b39469bcfe5d5d94cccca79d14e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-10-06 09:53:41 +00:00
hjk
3baaf16e49 Compile with recent Qt6
Some implicit #include <QPointer> apparently vanished in qtbase with
a0d931e4822.

Change-Id: I5e6c821fb0a8997c1b5767aeb7bd4007df7d501f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-06 09:47:46 +00:00
Marcus Tillmanns
85889e6a09 Utils: Fix connection
Change-Id: I1c17525be7326f836359ddcb911ae048f733a56e
Reviewed-by: hjk <hjk@qt.io>
2023-10-06 08:33:57 +00:00
Marcus Tillmanns
1fabd72514 DeviceSupport: Add more error output
Previously most errors when opening shells were completely
opaque to the user. This patch adds error output either via
QMessageBox if there is another modal dialog, or as flashing
disrupting messages.

Change-Id: I54be7a90295b61c23c739294c2d1d37c288ad273
Reviewed-by: hjk <hjk@qt.io>
2023-10-06 08:26:15 +00:00
Eike Ziller
14f1a137b9 Merge remote-tracking branch 'origin/12.0'
Change-Id: I7718e87b9eb47b57c5fb95889059593da82edc83
2023-10-06 10:11:17 +02:00
hjk
113efbfc85 Core: Cleanup OpenEditorsWindow interface a bit
Change-Id: Ie8c6e6ad76241ac35bda3f1e0234369f104b9cb2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-06 07:45:43 +00:00
hjk
fa0035cef3 Core: Use TreeModel for OpenEditorWindow
With 2000 open files this brings the population time from ~170ms
to ~20ms on my machine.

Change-Id: I1e6ba77ee4595276a7eaecafc9d7c84386b2155a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-10-06 07:45:27 +00:00
Shrief Gabr
f7cda6d173 QmlDesigner: Export a collection as Json
Task-number: QDS-10617
Change-Id: I08be4cc77bf11e93a395a82aef1522656807a8c1
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-10-06 06:36:31 +00:00
Marcus Tillmanns
577b26bf1c Utils: Remove unused function
Change-Id: Ib6aadb180a1208f5ee124f788619afa213aa6823
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-06 06:18:47 +00:00
Marcus Tillmanns
1da8f62783 HelloWorld: Cleanup
Change-Id: I19abb60e9a6db3a99955924f52c0b920b7fbd7f6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-06 06:16:27 +00:00
Orgad Shaneh
951f513088 LanguageClient: Use reference type in iterator
Coverity-Id: 1568462
Change-Id: I52e2ae4d271a7c5636f5f811dd7a2b07189166a3
Reviewed-by: hjk <hjk@qt.io>
2023-10-06 06:13:06 +00:00
Cristian Adam
9ab9c88e0a CMakePM: Include the last error/warning line from call stack
This was the first one reported by CMake, and we need to make sure it's
also included.

Change-Id: I5becfffc1afb35a4f69fd26d8563aa1ea6eaea60
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-05 16:23:41 +00:00
Cristian Adam
224b409013 CMakePM: Fix opening context help via F1 in hover tooltip
Change-Id: I9ebd6a6ec8e00c63bd6f9182ba8530944f3437ea
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-05 15:16:48 +00:00
Alessandro Portale
4d4bc2de7e CMakePM: Theme the CMake output prefix
Change-Id: Ic762867cb7249ae8f4e54e801dc5b6319f3f3e72
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-10-05 15:15:53 +00:00
Cristian Adam
16dfd2d374 CMakePM: Add "[cmake] " prefix to all output messages
With this one could easily filter the "[cmake] " messages from all the
messages in the "Generate Messages" pane.

Change-Id: I690650f0ccb0372c9361b95cfec41809737720d7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-05 15:15:32 +00:00
Cristian Adam
edf4280bd9 CMakePM: Support errors with call stack
This is usually the case when using a custom CMake API e.g.
qt_add_executable.

The topmost function is highlighting the error now, presenting the
callstack in the tooltip.

Change-Id: Ic8b8f60e8fe94d88dfa0b384639172370382a421
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-05 15:15:20 +00:00
Jarek Kobus
42bda582d5 GridGeometry: Remove unused variable
Amends 1c76217a70

Change-Id: I625df52dc6c18304598f95e921c3d3dea7bf74c6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-10-05 15:00:06 +00:00
The Qt Project
cdb08f3451 Merge "Merge remote-tracking branch 'origin/qds/dev' into 12.0" into 12.0 2023-10-05 13:59:50 +00:00
Tim Jenssen
e02f87da58 Merge remote-tracking branch 'origin/qds/dev' into 12.0
Change-Id: I36d7bf02cd4a9e2214877dc286a88d12685dd12f
2023-10-05 13:59:07 +00:00
hjk
af558a431f ProjectExplorer: Introduce 'userAtHostAndPort'
There is a case where we need the no-port version even with a
non-standard port.

Provide access to both version, but to avoid confusion, make the
difference explicit in the function names.

Fixes: QTCREATORBUG-29616
Change-Id: I9b93b7dd89099a4f24a7c7c0174bdc97b85666d4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-10-05 13:58:12 +00:00
The Qt Project
0a5f48a949 Merge "Merge remote-tracking branch 'origin/qds/dev' into 12.0" into 12.0 2023-10-05 13:57:02 +00:00
Tim Jenssen
85ea2758ac Merge remote-tracking branch 'origin/qds/dev' into 12.0
Conflicts:
	share/qtcreator/qmldesigner/connectionseditor/SuggestionPopup.qml
	share/qtcreator/themes/dark.creatortheme
	share/qtcreator/themes/default.creatortheme
	share/qtcreator/themes/flat-dark.creatortheme
	share/qtcreator/themes/flat-light.creatortheme
	share/qtcreator/themes/flat.creatortheme
	src/libs/utils/CMakeLists.txt
	src/plugins/CMakeLists.txt
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: Idd87c281e1aa7b7fd2702473ad55e18563cbfb21
2023-10-05 15:53:42 +02:00
Christian Stenger
3d18390bba Core: Fix typo
Change-Id: Ia612c40f4fddfeff97e571f27f3c498ea2ca6407
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-05 13:20:32 +00:00
Christian Stenger
4b70069e51 Core: Fix handling of settings
Without the default value setting the initial value already
triggers a 'Restart now or later' on closing the settings
dialog without canceling.
Amends 3726f0d6c1.

Change-Id: I3fa7071d945fbee1d282e46ad47b0d46b47ddbcb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-05 13:20:23 +00:00
Christian Stenger
ea01be4a49 SquishTests: Fix debugger test
Assign a name for a label for easier retrieval and fix the used
objects inside the shared script.

Change-Id: I1769b87d776a2dc9fee9ca9eb26805f6a8475fc0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-05 13:06:51 +00:00
Christian Stenger
52c47063b4 SquishTests: Adapt to changed wizard template
Change-Id: Iee09bbfdcd700d8a6a66c9ad7fec356d84dd2bd7
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-10-05 13:06:34 +00:00
hjk
86b8eefa51 Core: Use uniform row height in OpenEditorsWindow
Change-Id: Iee1b0c187d9265dc1204e88ffe5f1ba390773877
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-10-05 12:18:20 +00:00
hjk
b8d8fbf2c8 Core: De-O_OBJECT-ify OpenEditorsWindow
Not used.

Also, move a helper class to the .cpp.

Change-Id: I039655539974ebc40806dedb0706f5da831dd4e1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-10-05 12:18:13 +00:00
Christian Stenger
2537e73eb9 Revert "Adapt find tool bar input fields to searched widget's font"
This reverts commit 9dc9a43f40 as this may
lead to having multiple different fonts in similar widgets, even inside
the find toolbar compared to the editor when having different font sizes.
As there is no good solution to make this more consistent and appealing
revert the original patch.

Change-Id: Ie59bdb43721c467345e029376f13fa88b12d5e92
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-10-05 10:58:42 +00:00
Alessandro Portale
7c446268b9 Android: Pull androiddeployqt .json name retrieval into extra function
The name of the android-*-deployment-settings.json file will be required
in other places.

This factors AndroidQtVersion::androidDeploymentSettingsFileName out of
AndroidQtVersion::androidDeploymentSettings.

Change-Id: I41d4c978adb94776df7621369dbe545faabf81ac
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-10-05 10:25:47 +00:00