Commit Graph

82571 Commits

Author SHA1 Message Date
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
Robert Löhning
b366757502 SquishTests: Expect failure when renaming class
Task-number: QTCREATORBUG-29012
Change-Id: I3b6955d73c4908332c509d71a19afed60c2f42da
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-31 11:43:01 +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
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
hjk
59a6702271 Wizards: Enforce use of #pragma once in the Creator Plugin template
This should match Creator style, no matter what the users uses for
own projects.

Change-Id: I32e052b24ed6d029cd3c7a466bdf8191d1657e4e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-28 14:09:57 +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
Tasuku Suzuki
f0ba7bbbea QtQuick Application wizard: Remove unused import
Window belongs to QtQuick module in Qt 6

Change-Id: I8ff75320d84927db1fc79ba64538a3396203d36a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-07-28 13:53:33 +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
Robert Löhning
178b490997 SquishTests: Adapt test of navigation tree
Extends b57f72e3c8 to another test.

Change-Id: I419ce4fb05667fd22a1e913ef7122b191e12a34a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-28 12:34:36 +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
d9c5212c94 German translation: Remote Linux
Change-Id: I307ccc3c1a31124e5470abd1bdb2c6a80cb6794f
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-28 11:58:17 +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
Eike Ziller
55be030a62 German translation: WebAssembly
Change-Id: If526d36406855ae90c06e9ea76ba6fe8a6a92848
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-28 11:57:47 +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
Christian Stenger
6b39020295 SquishTests: Fix expected proposals
Change-Id: Id835185e621fac6adba3e1db15d1a3d782b571df
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-28 11:26:08 +00:00
Andre Hartmann
e49ac10cb1 Git: Ignore irrelevant changes in instant blame
Optionally ignore whitespace changes or line
moves to only show the last real code changes.

Feature is disabled by default.

Fixes: QTCREATORBUG-29378
Change-Id: Ia2d5ad926f4098554b1ed3365bffadd4e2063e8e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-07-28 11:10:40 +00:00
hjk
497bcbbf97 Perfprofiler: Make PerfConfigWidget a plain widget
Change-Id: Ic268db92d16657457cce404056732a3903be8205
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-28 11:02:47 +00:00
Christian Stenger
defc391738 PerfProfiler: Fix restoring settings
Change-Id: Ia669be096efc077d87b23ec6136ad5138363eb05
Reviewed-by: hjk <hjk@qt.io>
2023-07-28 10:59:53 +00:00
hjk
3ad3b6a975 AutoTest: Dissolve TestFrameworkManager
It's a handful functions around two independent lists.

Change-Id: I0a7015deef27a77d4e67488e1f9b6c7a8d71133b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-28 10:08:32 +00:00
hjk
8a6e4bea9e Autotest: Simplify framework registration functions signature
Change-Id: I249b73f0adf5a678145be9d00bee9a733097bfef
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-28 09:55:10 +00:00
Eike Ziller
d55d2cbb2f German translation: Haskell, Qnx, SerialTerminal, SilverSearcher, Vcpkg
Change-Id: I36d842b7641e81f5310dd4e31fa61c9ddab8e362
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-28 09:32:08 +00:00
Christian Stenger
c60f999a66 Fix qbs build
Amends 4ca7dd8763
and 80b23292b1.

Change-Id: I323a22b1427d51a1c25a41b2ab54eef8bc68a32f
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-28 07:52:16 +00:00
hjk
6ed56f640a Utils: Make it possible to change internal aspect updates
... without subclassing. This is useful in situations where there
are small modifications needed for simple aspects that are themselves
exposed as members of an aspect container in a header but we
don't want to create a subclass for it.

Change-Id: I058643137c38e564072af9a2f45b1576ea058651
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-28 07:31:00 +00:00
hjk
2559654132 GenericProject: Use the right kit in example creation
Change-Id: I1743f3bdcda0658ef5062f1a1784597b95e9bfec
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-28 06:38:19 +00:00
hjk
b51747b92c Utils: Remove AspectContainer::addAspect "factory"
Aspects are supposed to self-register in their constructor, or
if really necessary, by manually calling AC::registerAspect.

Change-Id: I6c6c46162d49d70c3cefebad8fec968a27faeadb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-28 06:26:39 +00:00
Thiago Macieira
e8ca1877de Use Qt 6.7's QProcess::UnixProcessFlag::CreateNewSession
Allow QProcess to do the setsid() call for us. Unfortunately, the
nice()-setting feature wasn't approved, so we need to keep the modifier
for that.

Change-Id: Icfe44ecf285a480fafe4fffd174d111b806eb3a8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-27 23:30:38 +00:00
Jarek Kobus
eaa9f0f4c1 QbsProject: Remove unused method
Change-Id: I44494c28a631850f215d7ae45209ef4be3c398d1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-27 17:21:21 +00:00