Commit Graph

82239 Commits

Author SHA1 Message Date
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
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
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
Christian Stenger
d08a6070b9 ADS: Fix compile
Change-Id: I97335e884d99f97efd70980064ae143b964c0ccf
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-07-21 12:27:54 +00:00
The Qt Project
d9c30e41c3 Merge "Merge remote-tracking branch 'origin/qds/dev'" 2023-07-21 12:13:26 +00:00
hjk
273939afce ProjectExplorer: Access default build properties more directly
Change-Id: I2c80e68028971e8b6fd10ef8fba6cf23834e02de
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-21 11:57:40 +00:00
hjk
fa9601990b Debugger: Register common aspects
Change-Id: Iaa43758bdf0e5060830213ae744a2d0baedf6c15
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-21 11:15:40 +00:00
hjk
ece7ae6bb5 Debugger: Avoid now unusual external trigger of readSettings()
Change-Id: I5a3c9f07e7b07184916b5ca3b95a8966c62193eb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-21 10:35:27 +00:00
hjk
032ba45fae Nim: Hide most of NimSuggestCache interface
Change-Id: I8fc114d253e7ca3a0cc3bed4542402acebfd9e86
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-21 10:35:09 +00:00
hjk
5f38ac700c Nim: Move unusual plugin private ctor content to its only user
Also, drop an unused Q_OBEJCT

Change-Id: I0c9188fd09268ca6b6daa94124219a6f9a2fefa8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-21 10:34:56 +00:00
Tim Jenssen
7df557c0ba Merge remote-tracking branch 'origin/qds/dev'
Conflicts: tests/unit/tests/printers/gtest-creator-printing.cpp

Change-Id: I5f791161ca1a2966e98a3ca55bc60e5bcbb8f58f
2023-07-21 10:20:45 +00:00
hjk
465d20fb15 ScxmlEditor: Compile fix
Change-Id: Iaf4bcc481f1637f3307aa302dbba33dbed822cbc
Reviewed-by: hjk <hjk@qt.io>
2023-07-21 10:19:13 +00:00
hjk
e607005096 ScxmlEditor: Simplify plugin setup
Change-Id: Ib28cca1c24780a710f6eae29d168203cbf235ef2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-21 10:14:21 +00:00
Eike Ziller
c9505c4412 Merge remote-tracking branch 'origin/11.0'
Conflicts:
	src/plugins/projectexplorer/taskwindow.cpp

Change-Id: I1ba32d76f151df16f70e930cc713525017e3dd92
2023-07-21 11:57:09 +02:00
Eike Ziller
be94484434 Issues: Prevent ever-growing session
The session contains a list of disabled issue categories, and that was
growing with each start of Qt Creator, accumulating entries for
categories that are added as "disabled by default".

When adding a category as "disabled by default", it would
unconditionally append it to the list of disabled categories. This list
is saved and restored at Qt Creator restart, and then, when the category
is added by the code as disabled by default, it was appended again, now
appearing twice.

Use a set for the disabled categories internally to avoid this.

Change-Id: I0e2fae92d5b78d6bcc13d946f27241ddb8da84b6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-21 09:55:42 +00:00
hjk
eb5e258d96 Beautifier: Delay-construct main settings
Even though it doesn't help yet as it's immediately accessed.

Change-Id: I7e3a40a05517130a9f747c82a3d4928378143947
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-21 09:24:41 +00:00
hjk
ce998a1661 Utils: Move pathChooser accessor from String to FilePathAspect
Change-Id: Ida3cf1ea8249461bd48327b0c77de1e66a2541e6
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-21 08:52:48 +00:00
hjk
afe1fb3676 Nim: Actually use the static instance
Amends e8fd863fcc, the global settings() function there was unused so
far, this here starts using it.

Change-Id: I0311baf7e4f86d138fdfafa146bf594b61b237f6
Reviewed-by: hjk <hjk@qt.io>
2023-07-21 08:35:36 +00:00
hjk
8a2aac2045 Nim: FilePathify NimSuggest
Change-Id: I9beeaa9f5441e040c039e8ceeeecf9c4b2053d22
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-21 08:35:27 +00:00
hjk
6847c7c5ae Utils: Consolidate some duplicated code in aspect implementations
Change-Id: Iad6b81d13705ce6ad752f2855fb47ea038ffe581
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-21 07:42:12 +00:00
Jarek Kobus
4267d6ad81 RemoteLinux: Inline wizard pages
Change-Id: I058c001e34653f7dfa96cd8886daea84be7dc6a1
Reviewed-by: hjk <hjk@qt.io>
2023-07-21 07:23:00 +00:00
Christian Stenger
760b8d7139 Tests: Fix qbs build
Change-Id: I12757ef3bccfad3fc6da4f2d22a24e3c4d92a71f
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-07-21 07:21:24 +00:00
Jarek Kobus
661f89be41 RemoteLinux: Make generic wizard reusable
Reuse it in QnxPlugin.

Change-Id: Ie60e2829dffa90a4097ef2a0cf1ab19220c2631f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-07-21 07:08:16 +00:00
hjk
5a3dc42485 Qnx: Use new AspectContainer base in QnxToolChain
Change-Id: I185c69c41e6350993f6e953200224e78575bdb93
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-21 06:57:37 +00:00
hjk
df0a3e2a85 BareMetal: More inlining of simple functions
Change-Id: I88413413a4db9a599ed673a818fb8947224605ae
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-21 06:57:32 +00:00
hjk
0137c7f8b6 BareMetal: Simplify a few tests for executable compiler
Change-Id: I9d85623b09a949be88075b031fa973c218e93e80
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-21 06:57:26 +00:00
hjk
6b8a70b37e BareMetal: Use aspect for IarToolChain::m_extraCodeModelFlags
Change-Id: I6438c93bb2a5200cf628900184a7db59d1fa1689
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-21 06:57:20 +00:00
hjk
da856ea9f1 BareMetal: Use aspect for KeilToolChain::m_extraCodeModelFlags
Change-Id: I847bc9260b645d75eb695e1d0791326e8a2b734e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-21 06:57:13 +00:00
Jarek Kobus
396c6c92f2 RemoteLinux: Make generic wizard similar to QnxDeviceWizard
Change-Id: Ia8feb1b5d18d7a1cebd14f37775a6097b1dc380c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-07-21 06:50:12 +00:00
hjk
81f8a3fd7d QmlProfiler: Move to new settings setup also for project settings
Change-Id: I204f052ddbc2956ff3bca8e6faaf2f758e4fee17
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-21 06:38:30 +00:00
Marco Bubke
655ec9d948 Utils: Fix SmallString::contains
Both strings are not null terminated.

Change-Id: Ib9fb88925ef6ba261ae3c1ef69f0450935d31cc1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-07-20 20:20:15 +00:00
Tim Jenssen
8cde647972 Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts:
  doc/qtdesignstudio/src/views/qtquick-designer.qdoc
  src/plugins/studiowelcome/stylemodel.cpp

Change-Id: I13c9e4e9404619d7ba649eae160774aafc042610
2023-07-20 22:18:47 +02:00
Tim Jenssen
ec4c5a9a08 qmldesigner: fix assert
ASSERT failure in __cdecl QmlDesigner::AbstractProperty::AbstractProperty(const class QByteArray &,const class std::shared_ptr<class QmlDesigner::Internal::InternalNode> &,class QmlDesigner::Model *,class QmlDesigner::AbstractView *): "a property name cannot contain a space", file qtcreator\src\plugins\qmldesigner\designercore\model\abstractproperty.cpp, line 32

Change-Id: Ie991c86f172f4c1a5c70340f44b524b3e15cd5db
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-07-20 19:32:51 +00:00