Commit Graph

68765 Commits

Author SHA1 Message Date
Ali Kianian
d9299272bc QmlDesigner: Make collection column selectable
Task-number: QDS-10895
Change-Id: Ibf047c5d3f38f93a6a58b692974c843467873610
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-10-09 10:45:30 +00:00
Ali Kianian
df8b6310c4 QmlDesigner: Select and delete a column of the collection
Task-number: QDS-10620
Change-Id: Ieba6ab7e4bf366cffad0c020f4d786096150eb0c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-10-09 10:45:15 +00:00
Marcus Tillmanns
fe430bebbe CompilerExplorer: Fix undo
Fixes context handling for the Editor. This allows Undo/Redo actions to
activate correctly.

Change-Id: Ieb7fa27215f5746cf5f26e8e7b3b74f44023481c
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-09 10:34:14 +00:00
Cristian Adam
399e12c973 CMakePM: Fix crash in findLinkAt
Fixes: QTCREATORBUG-29715
Change-Id: I4db919c8858631beb573789d1888b3dbee606c50
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-10-09 10:26:10 +00:00
Cristian Adam
ad680902b2 CMakePM: Fix condition for filtering out non CMake parameters
Coverity-Id: 1515708
Change-Id: I97de84f4db79977d7833337be87ae4877c10136b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-09 10:25:43 +00:00
Ali Kianian
6b3a278f13 QmlDesigner: Make the Collection header modifiable
Task-number: QDS-10620
Change-Id: I33c7beaf72decebe93a7e4d64d0ca6d6b3590af6
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-10-09 10:20:54 +00:00
Marco Bubke
f25413a151 QmlDesigner: Fix duplicate in .clang-format
Change-Id: I88b1a126e30894167de0e3023a957eb22b5368fb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-10-09 09:46:48 +00:00
Knud Dollereder
e10e0b5767 Use Control or Command and mouse wheel to zoom on mac
Fixes: QDS-10791
Change-Id: Iabe9199e4d1e04b8ac2daa94f4926e66ddaf5033
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-10-09 09:43:52 +00:00
David Schulz
ac5ab71db8 LSP: add resource operations to the protocol implementation
This allows the language server to request file creation, renaming, or
deletion.

Fixes: QTCREATORBUG-29542
Change-Id: I31ab3c0b36f87d3b797b54ff4261cab85a322e2c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-10-09 09:33:54 +00:00
Eike Ziller
c2ba218583 Markdown: Add missing commands for show editor/preview and swap
Change-Id: I4ea63d2bd7a89a1fc8299e83a0050e4f639190c5
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-09 09:31:26 +00:00
Cristian Adam
cbeeec2dc6 CMakePM: Fix Coverity issue "Arguments in wrong order"
Coverity-Id: 1526499
Change-Id: I4b5d7c4d12eca39b9c4e60b45ea3e67bce069069
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-10-09 09:14:40 +00:00
Jarek Kobus
3984108c0c CMakeFileCompletionAssist: Limit the size of PerformInputData
The size should drop down to 184 (from 264) bytes.

Amends 07e758147b

Change-Id: Ia07b153f3f75b9e7b6199d857d58bffbb7b3e7d4
Reviewed-by: hjk <hjk@qt.io>
2023-10-09 08:12:41 +00:00
Marcus Tillmanns
a70ead958e Docker: Use "type" instead of "which"
"which" fails for builtin commands, while "type" finds both
builtin and executables.

Change-Id: I2e508a01e28b827ed498add50f8faa9d58551e59
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-07 07:48:11 +00:00
Cristian Adam
1d2c942360 CMakePM: Only process cmake files for include and modules
... and not for every function. Just the CMake files.

Change-Id: I6e361f4913f8334942a3135adaa0480fdc0cee31
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-06 19:41:59 +00:00
Jarek Kobus
a31287dfe1 IosToolHandler: Avoid 3 arg connect
Fix signal arg for LogTailFiles::logMessage().

Change-Id: I8d50ee954e9fff2ececfcb17766e0b0cccb98a2b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-06 18:55:14 +00:00
Jarek Kobus
ee48dba19e FileApiReader: Make shutdown faster
Check more often for canceled future.

Make more functions static.

Fixes: QTCREATORBUG-27729
Change-Id: I8dd787acea6343008c7515fb6a4fdfde50b37aee
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-10-06 15:37:12 +00:00
Jarek Kobus
e4ae894c96 FileApiReader: Make stopping faster
On the session switch we are busy waiting for the running async task,
started before by the FileApiReader::endState(). This blocks the main
thread for considerable amount of time. E.g. when switching
between sessions both containing Qt project, it may block
the main thread up to 10 seconds.

Instead, we employ the future synchronizer and move the awaiting
to the shutdown phase.

The next patch is going to limit the awaiting in shutdown phase.

Task-number: QTCREATORBUG-27729
Change-Id: I956ed26edcd699d8a4e2b9309d109963f1d4bb20
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-10-06 15:37:06 +00:00
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
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
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
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
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
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