Commit Graph

68765 Commits

Author SHA1 Message Date
Jarek Kobus
0bdf6f2a50 WaitForBarrierTask: Don't derive from BarrierTask
The CustomTask<Adapter> isn't really meant to be derived from.
Provide a global function instead.

Change-Id: I8cfde260e638a34fa675126f3f412faab902e94a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-08-02 10:27:41 +00:00
Jarek Kobus
aa016cc5a7 Various Plugins: Add context object into connections
Change-Id: I360677bebfef16a3233b3b8177cff6da57ec7c31
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-02 08:55:37 +00:00
Jarek Kobus
5245cad811 ProjectExplorer: Add context object into connections
Change-Id: I50b9e8357881a2626e8026e7910399f0ae0a1d28
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-08-02 08:38:46 +00:00
Jarek Kobus
8dd46d0399 Various Plugins: Simplify return FilePath statements
Change-Id: Ia9efb86f722caca1492b577d51442f1f23b804b4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-08-02 08:19:23 +00:00
Jarek Kobus
82712e12f8 Various Plugins: Simplify return QStringList statements
Amends 925bb2ca31

Change-Id: I57bee33cb7acd0ab1cdcfb6897a4847b912b4c97
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-08-02 08:18:56 +00:00
Jarek Kobus
e9721641fc TaskTree: Add static assert ensuring the right Adapter type
Change-Id: I87e995151ec21963c5514dfdb1863cfd2bc457b9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-02 06:54:12 +00:00
Eike Ziller
c4089a699e CMake/macOS: Fix framework paths with CMake >= 3.27
Previously the "compileGroups" > "includes" section contained paths to
frameworks, like "<Qt>/lib/QtCore.framework" which we use to add a
framework path of "<Qt>/lib" to the code model. These paths moved to a
new "compileGroups" > "frameworks" section in file-api in CMake >= 3.27,
so we need to read this section as well.

Fixes: QTCREATORBUG-29450
Change-Id: Ica685006d1373fdc3efee6029acf4a7f7e8528f3
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-02 05:55:24 +00:00
Jarek Kobus
925bb2ca31 Various Plugins: Simplify return QStringList statements
Change-Id: Id014225851e6b9f8436387c681bea42e5de3b797
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-02 05:38:31 +00:00
Jarek Kobus
eb2b4b6cf3 Various Plugins: Simplify return QList statements
Change-Id: I36633128e061d0544e4752a65804b460371283f7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-08-02 05:38:14 +00:00
Christian Kandeler
34bc3030ec Update qbs submodule to HEAD of 2.1 branch
Change-Id: Iedb3708df80a1dcfeb7663ccff90fc7b4be4a400
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-08-01 16:08:42 +00:00
Artem Sokolovskii
609e5e2127 SxmlEditor: Fix crash with transitions and onEntry events
Fixed a crash in SxmlEditor that occurred when transitions and
onEntry/onExit events were displayed together.

Fixes: QTCREATORBUG-29429
Change-Id: Idca72ac1a661355a2caaa3f16457e4cfb9aaa785
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-08-01 14:28:37 +00:00
Aleksei German
e0197a791f QmlDesigner: Fix crash on Design View reopening
Task-number: QDS-10383
Change-Id: I21665b59a078a640eef50632628532b12149c435
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-08-01 14:22:41 +00:00
Miikka Heikkinen
b68802e08b QmlDesigner: Fix shader baker (qsb) file autogeneration
'-o' command line parameter was missing, so the tool interpreted
the target output file to be the source file.

Fixes: QDS-10207
Change-Id: Idb9468d56189314bfb9138e4237f7734b65cd4eb
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-08-01 14:16:06 +00:00
Burak Hancerli
98e24a199f Copilot: Fix the broken link in the settings page
Change-Id: Iabedbbd1cc4c3371bd5351e434918e8368705daf
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-01 12:46:27 +00:00
Eike Ziller
dd04e9bc0b EnvironmentKitAspect: Distangle VSLANG related code
Avoid funny side effect in "currentEnvironment".

Explicitly update the `Force UTF-8 MSVC compiler output` check box on
initialization, and when the user edited the environment.

Fixes: QTCREATORBUG-29382
Fixes: QTCREATORBUG-29425
Change-Id: I2b2615fa392ef0e4ee087d86207302b149a10768
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-08-01 11:43:31 +00:00
Miikka Heikkinen
855c27de2a QmlDesigner: Fix Qt version handling in new project dialog
Different wizards may have different options for target Qt version,
so don't hardcode them, but query them from the wizard.
Also initialize the default target Qt version index to correct value
in 3D wizard.

Fixes: QDS-10223
Change-Id: I75f6bf60655692c52b1350182bf3ac122efc1c74
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-08-01 11:08:20 +00:00
Eike Ziller
855d04cf7d IncrediBuild: Fix missing UI in build steps
Regression introduced by 35c60cd7b4

Change-Id: I6e184ed8f7cca61547b762cfd40132755af39d6c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-31 13:39:59 +00:00
Christian Stenger
61f0e31e30 Core: Set category icon only if path is set
Silences warning "Could not load image: ''".

Change-Id: I84bb86d3290040a2a0b7876ae540f7a0766b3b14
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-31 13:35:48 +00:00
Jarek Kobus
671bfad88e QbsBuildStep: Some cleanup
Get rid of unused profile() method.
Inline setBuildVariant() and setConfigurationArchitectures(),
as they are used just once.
Add context object to selectedAbis's connection.

Change-Id: I8c41327ee15d870e97ab496670af58ba2b13a913
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-31 13:26:13 +00:00
Aleksei German
d1623c38c6 QmlDesigner: Remove Update QmlProject File action
- removes the action from the file menu
- adds tr::tr to the menu string
- fixes an if condition
- adds some comments on how we can improve it

Change-Id: I5f816a8dc9245bec5aa0db13318b702414ad6bcd
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-31 12:39:37 +00:00
Mahmoud Badri
7d48260177 QmlDesigner: Prevent bundle effect add when no active 3D scene found
Fixes: QDS-10205
Change-Id: I88f3e6f95ea9beab1470dd8057d2b01497c2caf0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-07-31 11:43:07 +00:00
Jarek Kobus
a3254587ac QbsBuildStep: Remove qbsBuildOptionsChanged() signal
It is never emitted.

Change-Id: Ib0650a2139213a117796ebbfaf8e596752b14f6b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-31 11:25:05 +00:00
Marcus Tillmanns
385ff37f88 Terminal: Fix selection
A missing call to the base class meant that when starting to search with
a selection set, the selected text was not copied into the search field.

Change-Id: I1f2f1054a687d8b33b6733cc2a96e85ffa7f7816
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-31 11:23:47 +00:00
Jarek Kobus
d56a2a233c QbsBuildStep: Hide some methods in private section
Change-Id: I1f8ff6e12308d5dd41f4256efc061d93a157a1a7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-31 11:23:02 +00:00
Jarek Kobus
b0435da396 QbsInstallStep: Remove stepData() from the public API
Inline it instead, as it's used only once.

Change-Id: I4b8882334640493fed66504799d7cdfe367be1d9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-31 11:22:10 +00:00
Jarek Kobus
edb9dc409e QbsInstallStep: Reuse installRoot()
Change-Id: I3f563ea4a452b72c3a4eac478560ce65a0712713
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-31 11:22:04 +00:00
Jarek Kobus
aa89d7fd03 QbsBuildSystem: Do some cleanup
Get rid of CancelStatus enum and checkCancelStatus() method.

Change-Id: If703c78c8c3d82a5e6a5976c7c42c1da238744db
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-31 11:21:57 +00:00
Jarek Kobus
870cdb12f7 QbsBuildSystem: Properly queue parse requests
Rename parseCurrentBuildConfiguration() into startParsing().
Make startParsing() and cancelParsing() private members,
accessible only for QbsRequestObject.
Change the behavior of the public scheduleParsing() method.
It now queues the parse request. The new call to
scheduleParse() cancels any possible running parsing and
queues the new request.

Change-Id: Ia2459a98e299c04fa715e73ca349e303d5536d82
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-31 11:12:17 +00:00
Jarek Kobus
1b84828caf QbsProjectManager: Replace some dynamic_casts with qobject_casts
Change-Id: I55baf9938199891b444b3817dbd40df99bf4ce6a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-31 10:50:27 +00:00
Eike Ziller
305bdba221 Beautifier: Fix setting customized style (again)
Amends 4de56e2683

BoolAspect only changes its value if the check box is "clicked", so when
the customized style check box is clicked, the BoolAspect for
usePredefinedStyle does not change its value even though the check box
does.

Fixes: QTCREATORBUG-28525
Change-Id: Ie14c7669c7b41ef1a27dcb5ee69f610b773105fe
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-31 10:26:39 +00:00
The Qt Project
db33444b3a Merge "Merge remote-tracking branch 'origin/11.0'" 2023-07-31 10:00:24 +00:00
Christian Kandeler
c505188580 Update qbs submodule to HEAD of 2.1 branch
Change-Id: Ia4a7fe9c80b2936678a80b1b0a4e25f6695d6097
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-07-31 09:55:38 +00:00
hjk
7a2d4ed080 ProjectExplorer: Don't use QObject parents for ProjectConfigurations
... for ownership.

It was not really used anymore, the target manually deletes
build/run/deploy configurations, steplist their steps and
steplists themselves are proper members in build/deploy config.

Change-Id: I8addd1db0700342629fdab004ab42aa64291e93a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-31 09:54:06 +00:00
Christian Stenger
0717a76803 Core: Do not access system settings during creation
Do not directly access system settings during its creation.
Avoids an endless hang by recursive initialization.
Amends 7f908d737b.
Correct initialization is guaranteed by the init() of the
EditorManagerPrivate.

Change-Id: Ia58cfb5d6b11a2230915a8a0b5042bb26be5e1a2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-07-31 09:19:30 +00:00
Miikka Heikkinen
b051606ed2 QmlDesigner: Fix build without quick3d
Change-Id: I6a9ddebfc994dc187e837059c45e9b069ff743cc
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-07-31 08:31:32 +00:00
Orgad Shaneh
734c493aea ClangTool: Fix MSVC warning
warning: C4267: '=': conversion from 'size_t' to 'int', possible loss of data

Change-Id: Ic8214887787866c17a0eafc8ecac4640fdbbf231
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-31 05:33:50 +00:00
Christian Stenger
387512862d Designer: Fix qbs build
Amends 8d5897b8eb.

Change-Id: Ia297433fbcff88f352c23bae89625ee42ccd78be
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-31 04:44:16 +00:00
Orgad Shaneh
4ad3925da4 Merge remote-tracking branch 'origin/11.0'
Change-Id: I5cdff1f5db3fae89beef3d27316b21440541bb1c
2023-07-30 16:24:15 +03:00
Jarek Kobus
e378273576 QbsBuildStep: Introduce qbsBuildConfiguration() helper
Change-Id: I8053942380bcd18919e49e3a767edbf6ce770d5b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-28 14:51:06 +00:00
Jarek Kobus
3da1ce27ef QbsRequest: Enrich functionality with parsing
Change-Id: I8f189edb0e9fe51488bf98579945182e669fed0b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-28 14:50:59 +00:00
Jarek Kobus
5a2e6c9a9b QbsRequest: Implement request queuing
Change-Id: I33b33026aab34c06a2a4dd8c45f9c848c66de74b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-07-28 14:50:49 +00:00
Eike Ziller
17e932e305 Fix saving of keyboard schemes in presence of broken shortcut
QKeySequence can consist of weird keys, and QmlDesigner accidentally set
one to \u0002. Trying to write this into an XML attribute results in
QXmlStreamWriter simply failing and never writing anything.

Aside from fixing QmlDesigner in another patch, make sure that we only
write valid characters to the XML, by using the same checks as in
QXmlStreamWriter and writing/reading as hex-encoded as a fallback.

Also print a warning, if saving the keyboard schemes fails for any
reason.

Fixes: QTCREATORBUG-29431
Change-Id: Ief656ea42db3c1dceeb3f90a851eb9000b63f0c6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-28 13:55:14 +00:00
hjk
7f908d737b Core: Move SystemSettings page closer to current setup
Also align items a bit and use BaseAspect::setEnabler() where
appropriate.

Change-Id: I7497e3ce82f3685582a84b1bf383e65892d76f96
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-28 13:27:10 +00:00
Aleksei German
12067afc26 QmlDesigner: Add context object to a connection
Fixes: QTCREATORBUG-29438
Change-Id: I3662737acf3d80c17c8004594540220296971ef3
(cherry picked from commit cfadc5a984)
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-28 13:13:14 +00:00
hjk
bc1ef0f158 BareMetal: Remove error return value from fromMap
This was never used.

Change-Id: Ic4474fe4a7e634409523407d351529bdde89f4af
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-28 13:08:42 +00:00
hjk
e1211974a5 BareMetal: Make toMap signature more aspect friendly
Change-Id: I03b91db90e07c7ad6f6b59cd2d63f13b6961e268
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-28 12:47:29 +00:00
Eike Ziller
3006dab72d QmlDesigner: Fix wrong priority versus shortcut
The arguments were mixed up, resulting in a shortcut of `\u0002`

Amends 14b86100b5

Fixes: QTCREATORBUG-29431
Change-Id: I10cf959a9f9b24df1d1f544ad3ea80b1b2060751
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-28 12:33:30 +00:00
hjk
7d08f96da5 Utils: Remove AspectContainer ctor's parent parameter
Instead use setParent in the two cases that use it. The parent gets
in the way when attempting to derive AspectContainer from BaseAspect.

Change-Id: I6079beb0e00334133da115b714bc5186064c6722
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-28 12:24:04 +00:00
Eike Ziller
9d9e84296a Designer: Add -designer-qt-pluginpath argument also for Qt < 6.7
It doesn't have the public API yet, but hack it by temporarily changing
the application's library path, which is used by designer for the
default plugin paths.

Change-Id: I658e41d1228cb89cb6e72d51f3e70b17de32127c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-07-28 11:58:03 +00:00
Cristian Adam
3c0899d736 Debugger: use TemporaryDirectory for CMake debugger
Hardcoding "/tmp" is not the best idea.

Change-Id: I9d5abd48bdf37d842d790db5ae5c4a7b994075e1
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-28 11:55:31 +00:00