Commit Graph

72811 Commits

Author SHA1 Message Date
Christian Kandeler
69571427a3 CppEditor: Fix renaming include directives after bulk renamings
E.g. when renaming a class, the C++ model manager needs to know about
both renamings (.h and .cpp) at the same time. This way, it is able to
open the correct including file, even though the code model likely still
refers to the old, now-gone file path.

Fixes: QTCREATORBUG-30154
Change-Id: I583e77a4920c7cc3e642d7bebba46d734ae6bbe0
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-10 11:04:04 +00:00
David Schulz
9bcaf9ced9 ProjectExplorer: do not concatenate win debug messages
Individual debug messages got concatenated without a newline character
if multiple messages were received by the windebug interface thread
before they were handled in the main thread. The receiver of those
messages had no chance of handling those messages individually. This
gets fixed by using a list of messages instead of one concatenated
string.

Change-Id: Icfaf1b22db56829fcd143e574ee1033a63226c29
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-10 10:54:16 +00:00
Jarek Kobus
a6dea9091f TaskTree: Add static
Amends a50bc70b87

Change-Id: Ic0ea78fe8d9f74b50e4dc3310f3e17bdf520a5e8
Reviewed-by: hjk <hjk@qt.io>
2024-01-10 10:45:28 +00:00
Artem Sokolovskii
2d96d1a39f ClangFormat: Add parseConfigurationFile utility function
Change-Id: I7824e6bb77e9976aa212cdef478c4d40c4d8c56c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-01-10 10:26:51 +00:00
hjk
910126867d Squish: Use new setup pattern for SquishNavigationWidgetFactory
Change-Id: I44ac6a84f68b9b1fb22d9906921647e13d78de19
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-01-10 10:21:09 +00:00
hjk
cac955f2d7 TextEditor: Move OutlineFactory setup closer to new pattern
This is quite special due to the extra signal, but at least that's
hidden in the implementation now.

Change-Id: Id1130669fd1fdfb631d89460cfb884fb53858eec
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-10 09:41:32 +00:00
Jarek Kobus
52e0863bd2 TaskTree: Implement simple Loop functionality
Task-number: QTCREATORBUG-30081
Change-Id: I961d9c476d2af8742e461f92313ff0161d9de522
Reviewed-by: hjk <hjk@qt.io>
2024-01-10 09:38:15 +00:00
Jarek Kobus
a50bc70b87 TaskTree: Handle progress inside iterations
For temporary simplicity, take the strategy that only
zero-iterations (up to root) advance progress.

Task-number: QTCREATORBUG-30081
Change-Id: I7a0da2f141043622a07fa3e0cd03e3fb53417932
Reviewed-by: hjk <hjk@qt.io>
2024-01-10 08:56:02 +00:00
Jarek Kobus
1fe1055277 KitAspects: Avoid using keys()
Instead, iterate directly over the container.

Change-Id: Ie42136f29e5ddab8cd8da76e09616547187a2635
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-01-10 08:54:34 +00:00
hjk
00815e006d AutoTest: Use new setup pattern for TestNavigationWidgetFactory
Change-Id: I2d2c6f2a3dc8b416dae2e041f358a3f412216d4d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-10 08:22:40 +00:00
hjk
78a708f0fe Android: Move JavaIndenter class definition to .cpp
Change-Id: I0634062c22abfe592afb1be62616eaf05882519d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-10 08:22:17 +00:00
Jarek Kobus
1610bb8ff4 TaskTree: Prepare infrastructure for iterators
Task-number: QTCREATORBUG-30081
Change-Id: I5ad78314445508f52c3fb2ab0fd696940fe7b6dd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-01-10 07:59:12 +00:00
hjk
56ec7f8e69 LanguageClient: Use new setup pattern for CallHierarchyFactory
Change-Id: I1671498eb87f76a367cb52aa3dfd62c0b5ab7597
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-10 06:44:11 +00:00
hjk
317ca88e09 ClassView: Inline plugin class definition to .cpp
Change-Id: I0d9026fd2f6d98247eed2a44ab09ad7f1321ae64
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-10 06:40:50 +00:00
hjk
e87cd355d3 ClassView: Move setup of Manager class closer to new pattern
Change-Id: I2b836b839b1b082bdb6507082f689e2ef114eb9c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-10 06:40:44 +00:00
hjk
3873947c00 ClassView: Use new setup pattern for navigationwidget factory
Change-Id: I4e519d068c1ce85b6aee6e8743104703f6ddda8a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-10 06:40:38 +00:00
hjk
31702189be Nim: Clean up some editor component creation
Change-Id: Ic14e7852b1cb6db47b689e59ad24b3d0eb9c4792
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-10 06:39:55 +00:00
hjk
941ebc84e9 ProjectExplorer: Use new setup pattern for ProjectTreeWidgetFactory
Change-Id: Id046dca1358547e21a2920eac62f5a694c7f6905
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-10 06:39:42 +00:00
David Schulz
76b61a7993 Python: register python infos to the kits macro expander
... and use the name in the autogenerated kits display name

Change-Id: I928533e6f8238189d64350463897a86ff5512ae7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-10 05:32:23 +00:00
Cristian Adam
7a46bbe667 CMakePM: Do not add files to utility targets
On multi-config systems CMake is reporting "ALL_BUILD" or "ZERO_CHECK"
as targets to add files to.

When issued from menu File > Add New ... the selected target is the
first target namely "ALL_BUILD", which is a utility target and cannot
have source files.

Fixes: QTCREATORBUG-30170
Change-Id: I7617978c01f0a2554a3ec7d52ef9baaa16ed7a84
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-01-09 18:21:26 +00:00
Jarek Kobus
8bfb6dbf35 TaskTree: Pass const ref into StorageBase c'tor
Change-Id: Ie915fbda3e3ac1b424c4dd5f4d25f2e3fad233c5
Reviewed-by: hjk <hjk@qt.io>
2024-01-09 17:04:33 +00:00
hjk
63374fb34d QmlJsEditor: Don't export Internal classes
Export two functions doing the actual work instead.
Centralize some repeated code.

Change-Id: I7de674ef7ae5537663d1227d36cc556c4ee3ed74
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-09 16:17:37 +00:00
Jarek Kobus
e98e5cc980 Android: Avoid using keys()
Instead, iterate directly over the container.

Change-Id: I722dcf811a112b1b4845dcbcd6efe78cfe3b2e49
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-01-09 15:14:26 +00:00
Marcus Tillmanns
a14cd5d702 Utils: Allow async CheckableMsgBox without guard
Change-Id: I76cb8dcb5aa89cc9b98410daeeeba668279c6e45
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-09 14:25:06 +00:00
Artem Sokolovskii
03bce22663 SyntaxHighlighter: Fix leaking
Change-Id: Icd9e6cb18facbcb28692db114b952e96a66e2836
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-09 14:17:57 +00:00
Artem Sokolovskii
0618df9ea2 SyntaxHighlighter: Connect signal to this not to document
Change-Id: I4e76c4e06f385075d64b9fee1eb71d6d5212935b
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-09 14:17:49 +00:00
Cristian Adam
7fdfc2ac1d Auto-Setup: Forward CMAKE_MSVC_RUNTIME_LIBRARY to package manager
Fixes: QTCREATORBUG-30169
Change-Id: Icfbb497e067c5a5a4b57e91c9fa50bc0a2816bc3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-01-09 13:05:04 +00:00
Marcus Tillmanns
fcb752ff9c Utils: Add async methods to CheckableMessageBox
Change-Id: I296cb34453f5c12f712afedfe35b8962be8d7eec
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-09 12:59:20 +00:00
hjk
cca5f07d35 GlslEditor: Move some class definitions to .cpp
Also, de-Q_OBJECT-ify GlslHighlighter and a bit of code cosmetics.

Change-Id: I17469acc950fc77055f68918b1362f01e8a8c8a3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-09 12:41:06 +00:00
Marcus Tillmanns
060d4faed7 Terminal: Fix nullopt access
Fixes: QTCREATORBUG-30144
Change-Id: I9479d4cbfd8f930f405409c1c3f5252d23cca2da
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-09 12:02:52 +00:00
Marcus Tillmanns
99078778cc Terminal: Fix selection warning
When quickly selection text via double-clicking and moving the mouse to the left
it is possible that a selection is created where the start == end.
This was incorrectly reported as a warning.

Task-number: QTCREATORBUG-30144
Change-Id: I37b22f4ee725e5085ce0090c123ccfd9980b8a59
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-01-09 12:02:43 +00:00
hjk
a0ea8d4283 Appman: Add a appmanagertr.h
To be used as Tr::tr()

Change-Id: I473a44e70cbe745a4d60ee750ebcf87b5051f4ee
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-09 11:42:26 +00:00
hjk
7942c36ace Debugger: Fix passing of solib search path
Amends 92f7da917e.

Also, set it in all branches, not just remote execution, even if this
is the primary and currently actively used way.

Change-Id: I35149bd29b49dab419f83ec0cb424ae9b23827ed
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-01-09 11:42:10 +00:00
Eike Ziller
07a0ced947 TreeModel: Remove unused function overload
9124833a63 introduced an optional
parameter to removeChildren to suppress signal emitting, and
a61f9162f1 reimplemented that in a ABI
compatible way with a new removeChildrenSilently method instead.

The code now uses removeChildrenSilently, so the parameter to
removeChildren is no longer needed.

Change-Id: I8411d80f90e83b8746c2553dddb41c3f40a2bfc7
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-09 11:14:26 +00:00
Jarek Kobus
33ef73daf9 QtVersionManager: Make qtVersionsChanged args default
Change-Id: Ifb420ebdeefe18114f82c48c2c4c49d808caef0c
Reviewed-by: hjk <hjk@qt.io>
2024-01-09 10:57:34 +00:00
Jarek Kobus
1c8e88651c Squish: Avoid using keys()
Instead, iterate directly over the container.

Change-Id: I3fd55988fd3351f738e07c3b0611872279d929b4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-09 10:44:04 +00:00
Alessandro Portale
c4e938b407 Android: Resuscitate the "Configure Android options" InfoBar entry
The restoring of Kits was moved to a later stage of the startup
sequence. That is too late to connect to ICore::coreOpened.

This change calls askUserAboutAndroidSetup directly instead of via
connection.

Fixes: QTCREATORBUG-30131
Change-Id: I9b33df42177de05f2f9132ff3126fe03ffb8df20
Reviewed-by: hjk <hjk@qt.io>
2024-01-09 10:33:48 +00:00
Christian Stenger
d358589004 LSP: Fix building with Qt less than 6.4
Change-Id: I25f8be3a256328443dd42d72d05ce5b6b717bded
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-09 09:35:38 +00:00
Jarek Kobus
7b32c47494 QMakeProjectManager: Avoid using keys()
Instead, iterate directly over the container.

Change-Id: I589e87b0ed86be778aec7679bedab28d709a7697
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-01-09 09:34:07 +00:00
Jarek Kobus
2d422e33f0 Dap: Avoid using keys()
Instead, iterate directly over the container.

Change-Id: I417b413b06211428ab83d695f30cd5b2b4428a4b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2024-01-09 09:33:52 +00:00
Ali Kianian
63f8ecd003 QmlDesigner: Read DataStore.qml before writing properties
The properties of DataStore.qml are read, So the property-name for
a collection name will not be changed if it's not like the
Collection-name.
* Unique names will be created only when a user adds a collection.
* Renaming a collection shouldn't affect the related property-name
of DataStore.

Fixes: QDS-11540
Change-Id: I797a29c116051f79cfa6680360e5b086154a1df6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-01-09 08:32:08 +00:00
Jarek Kobus
6c8ef7153c CorePlugin: Avoid using keys()
Instead, iterate directly over the container.

Change-Id: I508126a6afc8f4354bc7810e09f57866d1d1d2ab
Reviewed-by: hjk <hjk@qt.io>
2024-01-09 08:28:15 +00:00
Jarek Kobus
1e7970ff0b Git: Avoid using keys()
Instead, iterate directly over the container.

Change-Id: I56242c5655977d199fa3d3cb2ed696a0aefbcaaf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-09 07:40:04 +00:00
Dominik Holland
e33d6fe5dc CMake: Expose information about Appman packages as Project extraData
Change-Id: I54c449f5bc7211271cecbef05045dd1490066bd6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2024-01-08 15:38:12 +00:00
Thomas Hartmann
6fcb853b19 QmlDesigner: Add QTC_ASSERTS
This can prevent crashes, but is unexpected behaivour.

Change-Id: Ie0944652c230a25e18f5d740cf134bc3ef7e2f2f
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-01-08 15:35:18 +00:00
hjk
e65dc8007b CMake: Remove ActionBuilder::setCommandDescription() calls
... where the default implementation via stripAccellerator(action()->text())
would yield the same result.

Change-Id: Ie921863d472e0592a8c97830d67873ccfb1b57da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-08 15:18:18 +00:00
The Qt Project
9ff7ea3980 Merge "Merge remote-tracking branch 'origin/12.0'" 2024-01-08 15:14:50 +00:00
hjk
c56bd22afd Utils: Introduce a FilePath::chopped() convenience function
Change-Id: I5fd813af83d58e62e026b3764d3d4378429c2162
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2024-01-08 15:07:19 +00:00
Eike Ziller
60d1838220 FancyMainWindow: Remove unused private member
Change-Id: I60b348e0712fc0e4443dc396b1656c31889d4f6b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-01-08 15:03:56 +00:00
Eike Ziller
8e4b5e1109 FancyMainWindow: Restore dock sizes when hiding/showing areas
Since we cannot make multiple dock widgets invivsible and visible at
once, the individual setVisible calls sometimes mess up the relative
dock widget sizes. That seems to also depend on which dock widgets take
part in that process. For example, when putting the Breakpoints view
together with other views into the right dock area in Debug mode, hiding
and showing that area would give the Breakpoints view more size than
before (similar with Threads and Stack views).

Remember the dock widget sizes and explicitly restore them when re-
showing an area.

Change-Id: I3868549ac7362a67f47fcf59b8fc3025befc86d2
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-08 15:03:48 +00:00