Commit Graph

82571 Commits

Author SHA1 Message Date
Christian Kandeler
3c58c87585 ProjectExplorer: Fix crash on toolchain re-detection
Fixes: QTCREATORBUG-29430
Change-Id: I8233371f70c3889ef81a3f111c298205712a2838
Reviewed-by: hjk <hjk@qt.io>
2023-07-25 14:58:31 +00:00
Jarek Kobus
e87a131c37 QbsBuildStep: Employ task tree for running
Task-number: QTCREATORBUG-29168
Change-Id: I508b7951f53f25f7cfd3e7f7e80086281cc7168e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-25 14:31:20 +00:00
hjk
8423d2b5e5 CppEditor: Proliferate use of FilePath a bit
Change-Id: I7e314d73a427bf40c10f3ca6c4c5804e31482f88
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-25 13:46:22 +00:00
hjk
cecf9c9136 Valgrind: Collapse project and global settings classes
Change-Id: I41b157bb07a451851641c7a5785334bd28036f45
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-25 13:37:20 +00:00
Eike Ziller
a419670ff5 Build: Change plugin json.in files to CMake style
They were still using variables in qmake style.
Directly use CMake variables in the json.in files and remove the no
longer needed escaping of quotes.

Adds a fatal message if it detects the old style in a .json.in file for
easier porting.

Change-Id: I8de88d8db2da55781f0e9d72eda03f943723188e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-25 13:21:16 +00:00
Eike Ziller
ad16dba14c GitHub/COIN: Use Qt 6.5.2
Change-Id: Id2c7b7080ac2efb05e93d88804007fc3f61e1dc3
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-25 13:20:57 +00:00
Eike Ziller
b11a6900e6 Build: Remove feature from the olden times
We don't set this to anything else anymore, so remove the option to set
it.

Change-Id: I9e2aced8909d557e3a4f0b8ca8fff70ac6ec2e1d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-25 12:28:33 +00:00
Jarek Kobus
18a9436330 Valgrind Parser: Hide Tool enum in cpp
Replace some explicit iterators with auto.

Change-Id: I30aad955e02cbffbfd4ffe100d381e32202fea05
Reviewed-by: hjk <hjk@qt.io>
2023-07-25 11:38:24 +00:00
The Qt Project
35602deb82 Merge "Merge remote-tracking branch 'origin/11.0'" 2023-07-25 11:33:20 +00:00
hjk
9a53869d51 ProjectExplorer: Dissolve ISettingsAspect
Covered by AspectContainer nowadays.

Change-Id: Id7eadaf089059031e6bd4c4b3e742e4ed0a1dc96
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-25 11:21:12 +00:00
Eike Ziller
931529dbec Merge remote-tracking branch 'origin/11.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I7818dc765c2a137d6690a9a53b8ddda72b79ba2f
2023-07-25 13:20:21 +02:00
Marcus Tillmanns
7ca17c2aa4 Terminal: Fix nano paste
Nano does not work well with pasted \n, so we replace them with \r.

Change-Id: I2518e6e2095b5ee76e8eca55dede7ed708f21b9e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-25 11:17:12 +00:00
hjk
2260c12f6c ADS: Replace some uses of FilePath::toString
Change-Id: Id6482e6e15d4c28f05a30b7eb05401cda4bce854
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-25 10:53:59 +00:00
Jarek Kobus
70b59e7400 SshDeviceWizard: Simplify the implementation
Change-Id: Iaa8c06e5bdea210c47c7672e9399729df3139020
Reviewed-by: hjk <hjk@qt.io>
2023-07-25 10:00:53 +00:00
Jarek Kobus
ef005dd56e RemoteLinux: Unexport some classes
And move them into Internal namespace.

Change-Id: Ic3cc92b8250413f46f597f99fe0f1e4c8ef68950
Reviewed-by: hjk <hjk@qt.io>
2023-07-25 10:00:43 +00:00
Jarek Kobus
d8ffbfb3ff RemoteLinux: Rename into sshdevicewizard{cpp, h}
Change-Id: I0a385887791be962f5ad4435b2b1b01913ae32c7
Reviewed-by: hjk <hjk@qt.io>
2023-07-25 09:53:26 +00:00
hjk
3f79a077e8 Core: Proliferate FilePath use a bit
Change-Id: I06c9a9875b0698e3ccab13a2f1136cdbcac621b3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-25 09:42:43 +00:00
Jarek Kobus
d8deb81e3f GenericLinuxDeviceConfigurationWizard: Rename into SshDeviceWizard
Change-Id: I67baad931c524376de6ae67a361db6866a910317
Reviewed-by: hjk <hjk@qt.io>
2023-07-25 09:37:24 +00:00
hjk
82f39892f9 Valgrind: Inline suppressiondialog.{h,cpp} into its only user
Change-Id: Ica1e67ce67c15c2481b0d892090f6a59fb6d2145
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-25 09:07:28 +00:00
hjk
b53d1186ea Valgrind: Remove one copied member when direct access is ok
Change-Id: I2813d062781571b50ae89e6f0482a4e72419ccde
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-25 08:49:39 +00:00
hjk
846ff37aac Valgrind: Fix valgrind settings persistence
Change-Id: Idcd551e10d36cbadb8785bd7922777a45a871518
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-25 08:45:22 +00:00
hjk
d31416a5f5 Utils: Introduce a way to immediate force aspect value saving
Will be used for e.g. valgrinds error categories. These are handled
by actions in a menu outside the settings page mechanism.

Change-Id: I2dea9b9f13dbc92fa3e9938f85aa083d01d0d99b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-25 08:11:33 +00:00
Eike Ziller
355e8d133c Fix some warnings about unused things
Change-Id: I42bb514dfe1d6745b1469b508a4cfa576e17c31b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-07-25 07:26:58 +00:00
hjk
c007be8a9a Valgrind: Save a few cycles in updateFromSettings()
Makes it easier to debug, too.

Change-Id: Id55591195bc645cfff002d04e4fdae6e4b3a4b85
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-25 06:05:27 +00:00
hjk
d22df34e6c Utils: Factor out code related to optional checkboxes for strings
We will need it twice when the FilePathAspect is fully separate.

Change-Id: Ief69af0e1167d5ca5c770c3cbd16fdafa16114f7
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-25 05:43:31 +00:00
Christian Stenger
370bd18dc6 Debugger: Fix persisting of common options
I have some notion where this should lead to, but we are not
there yet.

Change-Id: I402618a64dfef43c8e2089bface44ec5c822eb0b
Reviewed-by: hjk <hjk@qt.io>
2023-07-25 05:20:20 +00:00
hjk
d2bb1151f5 Valgrind: Merge configwidget population to settings aspect container
Change-Id: I021ef0ea9b3ab48c805a8af282a4062ddd701dea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-24 13:51:54 +00:00
Jarek Kobus
4d0564a147 QbsInstallStep: Employ task tree for running
Task-number: QTCREATORBUG-29168
Change-Id: I0fa0face3bcc567b8e29db2b23b2a48364252fed
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-24 13:16:33 +00:00
Jarek Kobus
aab5b73a31 QbsCleanStep: Employ task tree for running
Task-number: QTCREATORBUG-29168
Change-Id: I68e097747f8383d319d5c14eeb5bb9f1a94353a5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-24 13:16:20 +00:00
Jarek Kobus
4997a23f15 QbsProjectManager: Introduce QbsRequest
It's going to be used in task tree for QbsBuildStep,
QbsCleanStep and QbsInstallStep.

Change-Id: I347562b72a628b66d648f943c2fbf67df69c0bc5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-24 12:37:54 +00:00
Christian Stenger
b6eedab123 QtSupport: Omit default parameter
Less noise.

Change-Id: I5ea7f258b10a35374afb161b63729a5a4fa4ab2b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-24 12:16:07 +00:00
hjk
773a28acea Valgrind: Move global settings handling closer to current pattern
Change-Id: I41f35485ef51b977ee75fec53dbf0c8d75a27461
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-24 11:26:43 +00:00
Eike Ziller
08bbe885b4 Examples: Support manifest-defined category order
Reads a separate sorted list of categories from the manifest files.
The first of these lists that is found in the manifest files is used.
For example the Qt documentation defines the list in the manifest file
for qtdoc.

Change-Id: I57c2779862a5ebfc27707b53d43d4ed9e7e8c5f9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-24 11:02:18 +00:00
hjk
5af88f5702 Ios: Use aspects more directly in IosRunConfiguration
Change-Id: Ic6fd16287e28a16c231b0b30211f112aceb11795
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-24 10:45:04 +00:00
hjk
c558896594 ProjectExplorer: Replace the fromMap error return value for toolchains
... by some out-of-band mechanism, keeping previous functionality.

The driving reason is to get the same fromMap signature as in the
AspectContainer base.

Change-Id: Ife7fbf4d0e0f78d88729021eb5220ec4a8ddb2ec
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-24 10:17:36 +00:00
hjk
678e8d3137 PerfProfiler: Convert to current settings scheme
Change-Id: I33e667a1cd9515f17af1bf9b2af6171b083c79de
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-24 10:04:02 +00:00
hjk
45aa708e89 Haskell: Delay settings creation
Change-Id: I45666aa8aab1caa776d2f9f23455dc6a92384018
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-24 09:28:56 +00:00
hjk
5d67ad37cf Debugger: Simplify code path leading to .writeSettings()
Change-Id: Iaea1159305507e10adf2b448a774e2b528eaef80
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-24 08:16:39 +00:00
Eike Ziller
7786eb3088 German translation: BareMetal
Change-Id: I67beed63915ed2f5f14abef529512aa3560d15ae
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-24 07:02:32 +00:00
hjk
1c4f973365 ProjectExplorer: Replace the fromMap error return value
... by some out-of-band mechanism, keeping previous functionality.

The driving reason is to get the same fromMap signature as in the
AspectContainer base, however, the whole mechanism seems rather useless:
There are only a few places that actually ever could report errors,
in those places "moving on" looks ok, too, and these few places
are not conceptually different than a lot others.

Removal of this (new) mechanism is left for later.

Change-Id: Ibe7a0456bc3b84a84e942231f14446e783372d76
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-24 06:31:51 +00:00
Christian Stenger
a263d3de89 Tests: Fix cmake build
Change-Id: I1e42c0361aa92b54e52ba2c29f26f3f3f600e898
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-24 06:26:25 +00:00
Thiago Macieira
93de403391 Fix build: contextless QObject::connect are not permitted
The Qt6UiPlugin cmake file defines QT_NO_CONTEXTLESS_CONNECT as part of
its interface (I don't know why and don't care why), so remove the
contextless connections by adding context.

formeditor.cpp:363:21: error: no matching function for call to ‘Designer::Internal::FormEditorData::connect(Core::EditorManager*, void (Core::EditorManager::*)(QList<Core::IEditor*>), Designer::Internal::FormEditorData::fullInit()::<lambda(QList<Core::IEditor*>)>)’
formeditor.cpp:490:21: error: no matching function for call to ‘Designer::Internal::FormEditorData::connect(QAction*&, void (QAction::*)(bool), Designer::Internal::FormEditorData::setupActions()::<lambda()>)’

Change-Id: Ib84fc618ac204205bf7afffd1773ef41ee3e7fdd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-24 05:13:25 +00:00
Jarek Kobus
de4c1adbfa QbsBuildStep: Some cleanup
Change-Id: Ic3e7fe9a2aaabebd44acd1a61941318a0698d3e1
Reviewed-by: hjk <hjk@qt.io>
2023-07-21 16:24:48 +00:00
hjk
53d06feecd ProjectExplorer: Change ProjectConfiguration::toMap signature
To match better with the rest, especially the base AspectContainer.

Change-Id: Ide0966cab3219800aa6b7b9e6012731a3fbe7a6f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-21 16:12:15 +00:00
hjk
1a88508654 ProjectExplorer: Use latest settings style for compile output window
Change-Id: I6b4c8bf3ed7b9589a4b7e7ee77cd0fc5011954c3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-21 15:43:55 +00:00
Jarek Kobus
062cea9601 DebuggerRunTool: Hide some methods in protected / private section
Change-Id: I9ab5fb1b8661191080e270307a3be8723d7b6f7c
Reviewed-by: hjk <hjk@qt.io>
2023-07-21 13:44:21 +00:00
Jarek Kobus
be0e0490af DebuggerRunTool: Remove unused methods
Change-Id: I9f55e79bc202eedbf594100155fc18fedaf7b814
Reviewed-by: hjk <hjk@qt.io>
2023-07-21 13:44:14 +00:00
hjk
5a378ef798 Debugger: Fix inverted logic for adding magical search paths
Change-Id: I8471242cd422a68a2652ff23741d0615380e2e8d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-21 13:37:46 +00:00
hjk
0f91561667 Utils: Make FilePathAspect::value() return a QString
This is meant to be the "internal", raw, unexpanded value that does not
necessarily match a scheme://host/path pattern before expansion.

Change-Id: I627afbe1e9682d85c5bb04542c7354760ba9a13f
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-21 12:48:23 +00:00
hjk
0a37ff4149 Utils: Move some more FilePath-only functions to FilePathAspect
Change-Id: Id814e69339d510e88efbf95108c7573bcc53a87b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-21 12:34:35 +00:00