Commit Graph

82976 Commits

Author SHA1 Message Date
Marcus Tillmanns
07374a7114 ClangFormat: Do not change incompatible settings
Fixes: QTCREATORBUG-29190
Change-Id: I81730f59f05c8aba718a60deebfeb2b1b3aa0d7f
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-07 07:16:23 +00:00
Jarek Kobus
2934e30ad0 NetworkAccessManager: Remove unneeded includes
Change-Id: I8263984565a9eaf2393612843c2eb79ce9e118f5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-07 07:16:07 +00:00
hjk
6d5b725d45 Debugger: Replace some uses of deprecated QVariant::type
Change-Id: I2225668b51d82e017cda305737f8c93fdaf97bd7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-07 07:16:02 +00:00
Jarek Kobus
16fc0fcf1c CppEditor: Reuse QScopeGuard instead of ExecuteOnDestruction
Change-Id: Ia60c8eab687599dbaa519daeab74e8799c33af95
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-06-07 07:15:44 +00:00
David Schulz
bae8e28fee TextEditor: Add tests for the generic highlighter
Change-Id: I5a5092ed0a997800bf6653ab25d69f08f4aa0c37
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-07 06:20:42 +00:00
Christian Stenger
07fbf12574 McuSupport: Do not try to handle non-existing targets
Silences the warning message box if Mcu settings page had been
opened and stays unconfigured, but Ok or Apply is used to close
the settings dialog.

Change-Id: I28179b7e7d306bfb08e8066982548ca6b954120d
Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-07 04:21:18 +00:00
Henning Gruendl
3badd8557f QmlDesigner: Remove old states editor
Task-number: QDS-10037
Change-Id: I1aec5052ef5a90a19d2adbb73c1def23f337e42c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-06 23:06:49 +00:00
Tim Jenssen
723b71e897 QmlDesigner: fix typo
Change-Id: I2390509fab6fc0a6b71f90bacc7173b4540c3dc3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-06 21:06:04 +00:00
The Qt Project
c65c71c4e3 Merge "Merge remote-tracking branch 'origin/11.0'" 2023-06-06 14:50:48 +00:00
Eike Ziller
967c53696c Merge remote-tracking branch 'origin/11.0'
Conflicts:
	tests/manual/subdirfileiterator/tst_subdirfileiterator.cpp

Change-Id: I6fa8fbed152efc4033fa69e1ab67ced7e2ad35bc
2023-06-06 16:50:22 +02:00
Artem Sokolovskii
ac24b23ff8 ClangFormat: Add file size threshold
Add file size threshold to prevent qtcreator freeze
when a file is big. The default value is 1MB.

Change-Id: I356c64cd5ca99a34413043896076dbab859538b6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-06 14:42:55 +00:00
hjk
390b4aa895 ProjectExplorer: Replaace some QVariant::type() uses
Deprecated since Qt 6.0 in favor of typeId()

Change-Id: Ib6ab5196ad9ec4cb2d3dbc2d4f1ceca5cfdcdd07
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-06 14:36:09 +00:00
hjk
9db19c653c All: Replace deprecated QLibraryInfo::location
... by QLibraryInfo::path() which exists since 6.0

Change-Id: I0e1e071e0d279ddaf1f1027a0e6ce350ab21739a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-06 14:35:55 +00:00
hjk
52db6f38f7 Utils: Replace two deprecated uses of .count()
Change-Id: I13d683b762c5093231e42c57d58ae322746d9922
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-06 14:35:46 +00:00
Eike Ziller
58c5c627a5 General settings: Move toolbar style to theme setting
And fix label style, we don't use book style capitalization for labels.

Change-Id: Ibd98c911165f720adee73654d8214adfc02d9f9e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-06-06 14:29:16 +00:00
Eike Ziller
e1f1d45225 Beautifier: Fix restoring of settings
Amends 7dd27301ab

Fixes: QTCREATORBUG-29250
Change-Id: Iaa0af369055708c738c37ffc466f3d0fe8901b89
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-06 14:28:25 +00:00
Eike Ziller
414e156177 Markdown: Set focus to text editor at start
Take two. Amends d9e3d32a80

Change-Id: Ib3680df9ea7954e00326be2aee71ed2862a74a6e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-06 14:09:20 +00:00
Aleksei German
47788874ac QmlDesigner: Fix Qt for MCUs tag for qt6 projects
Task-number: QDS-10051
Change-Id: I16b1c2a43860bec047db3254a9386b137be70e69
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-06 14:03:34 +00:00
Thomas Hartmann
15e495f9f7 QmlDesigner: Make sure the plugin is always properly initialized
If QDS is started with a startup project it is possible
that ::showDesigner is called before ::delayedInitialize().

Change-Id: If8afdefdd662102cbee41ded2e21735767292956
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-06 13:59:05 +00:00
Aleksei German
4648f055a1 QmlDesigner: Fix int conversion warning
Change-Id: Icbc5547bca8ada55a6c02a7ca9e4f5d169a70553
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-06-06 13:24:59 +00:00
hjk
1c2cf83c69 QmlDesigner: Inline assetexportdialog.ui
Change-Id: Ie22beaf507fcf146bcd3c5d228cafa33941425d8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-06 12:35:27 +00:00
hjk
9b6ff3fb36 Vcs: Use PagedSettings for common settings
Also restrict the Reset VCS Cache button to the second
column, as it was earlier.

Change-Id: I291fdceb11df4ecdfdc0887fd521288d0b4544f3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-06 12:35:11 +00:00
Leena Miettinen
1348f0cfe0 Doc: Fix description of Add Class Member refactoring action
The developer must enter the data type of the member only if
automatic detection fails.

Change-Id: I51c1f36aeb34fb6560701cbd30a5748be5f1cde0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-06 12:06:49 +00:00
Robert Löhning
9cc9ec2aec SquishTests: Remove workaround for fixed bug
Task-number: QTCREATORBUG-28985
Change-Id: Ib69ccd0f967484a9858ddebdf08a376035e42e90
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-06 11:46:07 +00:00
Christian Stenger
a81c9b497a Tests: Fix qbs build
Change-Id: Ia4a54bab4208c5cdf1c7ce67f5caab84aa1583ef
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-06 11:45:04 +00:00
Thomas Hartmann
90b36d88e2 QmlJS: Add support for annotations in qmljsreformatter
This fixes that the annotations are removed. The indentation
still has issues.

Change-Id: I6752767e00e0fafe8eb567066db3b9952f0d0a4f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-06 11:17:46 +00:00
David Schulz
d617b046c6 Python: support remote file paths when loading projects
Change-Id: I94f709275d3b226685439ac55d58b029d3323d12
Reviewed-by: hjk <hjk@qt.io>
2023-06-06 10:55:06 +00:00
David Schulz
beaf86f9de Python: filepathify python project path for saving
Change-Id: Ibcea9de6c8844cb826b61aa40357890153923854
Reviewed-by: hjk <hjk@qt.io>
2023-06-06 10:42:13 +00:00
Burak Hancerli
5dadc57bc3 QmlProject: Fix escaping while rewriting the qmlproject file
Task-number: QDS-10032
Change-Id: I856d9935a1c77085f79008db19920f12af9e1a21
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-06 10:16:30 +00:00
Alessandro Portale
b3e51d6242 ProjectExplorer: Fix build progress icon alignment
The build progress warnings/error icons were not vertically centered.
That was noticeable with the "Relaxed" toobar style.

Fixes: QTCREATORBUG-29252
Change-Id: I921ccc936c3233b2b2f80979aaae2b09709dbcff
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-06 09:32:12 +00:00
Christian Kandeler
0a1073f7cd ClangCodeModel: Restart clangd on changes in VCS repository
This should prevent the index from becoming stale after e.g. a git
checkout.

Change-Id: I94d364d3f2ec38889564c7859ca95ccb2de3019d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-06-06 09:18:12 +00:00
Artem Sokolovskii
80665d6acf Fix master build
Amend a78720060e

Change-Id: I179fac4a604a6e582fd289ac972068b74ef4288f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-06-06 09:16:54 +00:00
Jarek Kobus
d97d3f58ac TaskTree: Rename TaskItem into GroupItem
Not all classes derived from TaskItem are tasks,
but the common denominator is that all may be placed
inside a group: thus GroupItem sounds more appropriate.

Addresses the 10th point in the bugreport below.

Task-number: QTCREATORBUG-28741
Change-Id: I94d728a8e39ec732810f2e5bbe6b9a76f3bc387c
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-06-06 09:06:01 +00:00
Christian Stenger
969f560c61 SilverSearcher: Fix missing include
Amends 64d209c24b.

Change-Id: Ib73302e98e4779e8d8f232852d45903a4055172a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-06-06 08:23:31 +00:00
Eike Ziller
8b85ac30a4 Do not show Design Studio settings page in Qt Creator
Change-Id: Iab2b8806f8041685440670fe741f25fb895afd99
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-06-06 08:14:18 +00:00
Alessandro Portale
6b04989fce Utils: Introduce customMargin(const QMargins &)
And re-use it for normalMargin() and noMargin()

Change-Id: Id779e2fa052ab35df3dd917d890ca7808dfb1a8c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-06-06 08:08:01 +00:00
Jarek Kobus
3f9704846b ImageScaling: Get rid of doc example markers
In order to more easily compare both implementations.

Change-Id: I4ff48cb4d4e61be4e2c8834f63091f4d825db0be
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-06 08:05:58 +00:00
Jarek Kobus
c3344c740a Tasking: Import imagescaling example
It's an initial copy of the
qtbase/examples/qtconcurrent/imagescaling.

The goal is to implement it using TaskTree and
compare both implementations.

Change-Id: I92953a70a3330ac679823060e75e5f39971ae444
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-06-06 08:05:39 +00:00
Jarek Kobus
9694d9c6f6 Tasking: Introduce NetworkQuery
The NetworkQuery class is prepared to work with TaskTree.
Provide the task tree adapter for the NetworkQuery class.
Register the task inside the Tasking namespace under
the NetworkQueryTask name.

This class introduces the dependency to Qt::Network,
otherwise Tasking namespace is independent on Qt::Network.
Possibly, may be added into Qt::Network lib,
as a wrapper around the QNetworkReply.

Change-Id: I29f160c0bf128c567ce20f044540b2dd6f1e17c4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-06-06 08:05:14 +00:00
Mahmoud Badri
115b8c8572 QmlDesigner: Fix 3D editor's toolbar extension button alignment
Fixes: QDS-9725
Change-Id: Id9ef221a4d8760d3e102913c42b2109475147360
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-06-06 08:03:55 +00:00
Alessandro Portale
73791080d4 Core: Use LayoutBuilder in CommandMappingsPrivate
Change-Id: I327e3eae887c0e4e1dfe600685e71c194f26ff75
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-06 07:58:16 +00:00
hjk
f5d02f4bcb Utils: Fix compilation with recent Qt dev
After an update of Qt dev the following code in Creator fails to compile with

/data/dev/creator-out/src/libs/utils/aspects.cpp: In member function ‘void Utils::IntegersAspect::setValue(const QList<int>&)
/data/dev/creator-out/src/libs/utils/aspects.cpp:2323:35: error: no matching function for call to ‘transform(const QList<int>&, <unresolved overloaded function type>)’
 2323 |     BaseAspect::setValue(transform(value, &QVariant::fromValue<int>));

Work around by using a lambda.

Change-Id: Id5a844e7e5fe1846c4904dbad21472743439c4da
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-06-06 07:45:48 +00:00
hjk
cfa88ac169 QmlJS: Avoid deprecation warning
de18b3ff370543b5b99bd068b871a2cd677cf9f3 deprecated the
QCryptographicHash::addData(const char *data, qsizetype length)
overload.

Change-Id: I86444a9d7de3cafc596f508fc08c3a4c1f25142f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-06 07:45:27 +00:00
hjk
82966bc7ba Revert "ProjectExplorer: Remove 4.11 compatibility code in buildsteplist"
This reverts commit c8e1333f89.

Contrary to the comment in the code this is apparently still in active
use in the user file accessor.

Change-Id: I5e5dddbe2a95c70bda92ce732688041787145055
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-06 07:14:41 +00:00
Marcus Tillmanns
7b3c2c13a1 Terminal: Decode percent encoding
Fixes: QTCREATORBUG-29254
Change-Id: I0d1712753f488dff9252d2fcf099c9aefb06ed0b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-06 06:43:36 +00:00
hjk
ebc185b1bb QmlProjectManager: Use FilePathAspect for device QML viewer overide
Cosmetical.

Change-Id: I480fd3163b45c3b2a19b7636cb79d6cb9b166825
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-06 06:43:04 +00:00
Jarek Kobus
b7bd30aeb8 Tasking: Introduce ConcurrentCall
It substitutes Utils::Async, but is Utils independent.

The ConcurrentCall class is prepared to work with TaskTree.
Provide the task tree adapter for the ConcurrentCall class.
Register the task inside the Tasking namespace under
the ConcurrentCallTask name.

This class introduces the dependency to Qt::Concurrent,
otherwise Tasking namespace is independent on Qt::Concurrent.
Possibly, may be added into Qt::Concurrent lib,
as a wrapper around the QtConcurrent::run() call.

Change-Id: I4511ff0430e78346aa6a4fae1a9d5370fdd08506
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-06 06:35:45 +00:00
Marcus Tillmanns
8d02d96127 Terminal: Fix esc button update
Change-Id: I4862de654ab920faa46742b4a4433dff07ed0387
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-06 04:37:59 +00:00
Thomas Hartmann
cc67fe2897 QmlDesigner: Take '.' properties into account in convertToVariant
What we call dot properties have two styles.

something.x

something {
 x: ...
}

In the second case the prefix is set, because in the model we always
normalize the syntax to the first case.

toString() properly walks the array to collect the full identifier, instead of just taking the base property name.

Before we were using e.g. 'eulerRotation' as the property type and tried to convert a single float to a vector3D. The new code uses thefull property name 'eulerRoation.x' and the conversion succeeds.

Task-number: QDS-10027
Change-Id: I7210558db6a0f91f5f1a25b719df06beb70c5b83
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-06-05 12:39:03 +00:00
Jarek Kobus
b14c07eed6 TextEditor: Reuse qScopeGuard instead of ExecuteOnDestruction
Change-Id: I2ca7d4676bb4f34fbf59fd45bcd01d7857cb7e4e
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-05 08:35:14 +00:00