Commit Graph

82976 Commits

Author SHA1 Message Date
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
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
Eike Ziller
15383448c0 Bump version to 11.0.1
Change-Id: I94e939f2cf81adedea914873dc0b5aa87decdb2f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-21 12:26:57 +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
Cristian Adam
20e43b49e9 Debugger: Fix core loading dialog
With lldb on Windows I had cases when the "OK" button would be disabled
even though I had the files set for both fields.

Change-Id: I510e63d0e27e685df7c5c3f6e6f1d608f0e63bb0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-21 11:10:26 +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
Tim Jenssen
fe3c82de1c qmlpreview: fix crash
Change-Id: I862a02b24948435f700cf9284edb369a92ce584d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-07-20 19:32:15 +00:00
Jarek Kobus
012f926f7c BuildManager: Move some repeating code into buildQueueAppend()
Make it clear that calling init() on newly added build steps
are always followed synchronously by starting a build queue.

Change-Id: I9918b2e595cdb1d0639490e3edf77e67fb8ae52e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-07-20 15:59:10 +00:00
hjk
32850e7fcc ProjectEplorer: Base ToolChain on AspectContainer
Similar approach as done with ProjectConfiguration

Change-Id: Ia5e1d464b7c5c64d7a12ee12c7673ff453f24390
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 15:27:07 +00:00
Jarek Kobus
a38c8a88b2 BuildManager: Simplify buildQueueAppend()
Pass QList<BuildItem> instead of two separate lists
with build steps and their names.

Use "continue" when disabled or when init succeeded.

Move the "if (!init)" early return directly into the previous loop.

Append directly the passed items into the m_buildQueue.

Change-Id: Ie1bfc4e0695bf24d5bf25570523fed9b6b8c31e3
Reviewed-by: hjk <hjk@qt.io>
2023-07-20 15:25:48 +00:00
Marco Bubke
0533636758 Utils: Skip one temporary string in constructor
Instead of creating a temporary string we simply call append directly.

Change-Id: I75ffd80a4359a19892b196f5d1ddb50b90c5a2cd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-07-20 15:06:43 +00:00
hjk
c1309f9417 ProjectExplorer: Change ToolChain::toMap() signature
... to something similar to AspectContainer::toMap() as
preparation for later aspectification.

Change-Id: Ic60060ad1a7eb1aba58ded01221b016c684db073
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 15:01:52 +00:00
Jarek Kobus
580d605fd3 BuildManager: Add ParserAwaiterTask helper
Change-Id: I5c22b8a17d6495c3411e979e3e79cf9415236442
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-07-20 14:38:48 +00:00
Jarek Kobus
cd81336f40 BuildManager: Avoid code repetition in 2 "if" branches
Change-Id: If3ecb5457c2f7b661bed1c8daf80bf289204da15
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-07-20 14:33:06 +00:00
hjk
d5f754d456 BareMetal: Inline some simple toolchain function
Change-Id: I01112a82c1de101e16dfa262413dbac17400d375
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 14:31:16 +00:00
hjk
2b9882f563 BareMetal: Hide SdccToolChain definitions
Not needed publicly.

Change-Id: Iee1243c48d0b3308316bb6e7b4f4a34b0551f4ed
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 14:20:54 +00:00
hjk
e3dd3521d4 BareMetal: Hide KeilToolChain definitions
Not needed publicly.

Change-Id: I40272a26a450a10ada8e5d579dd6a2b5bd3c259a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 14:20:49 +00:00
hjk
048cd9d143 BareMetal: Hide IarToolChain definitions
Not needed publicly.

Change-Id: Id8250f32c64dbb53434082ae1d885b47f8a8d666
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 14:20:43 +00:00
hjk
7cc6078756 Utils: Let aspect transition functions indicate there was a change
Helps to make it easier to reason about the necessity of emitting
*changed signals.

Change-Id: Ieab29b25f5cc2799e193417b9cab02c99501c60a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-20 13:52:24 +00:00