feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
84,673 Commits 108 Branches 368 Tags
f5cb1530a41fb61ab653bb1aecdf99b24280a341
Commit Graph

68765 Commits

Author SHA1 Message Date
Tim Jenssen
adc901ba2c QmlProjectManager: fix warning when project has no mainScript 
happens at start when project is still parsing

Change-Id: I02b1d52b41c4f092fb4f45cf3dcf192e29eda324
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2023-06-07 09:50:15 +00:00
Tim Jenssen
2b4fe0aef8 Qml: fix Boot2Qt deployment from Windows host 
- fix QmlBuildSystem::target*() to resolve maybe device files
 - Cache lookup of qml path on device

Task-number: QDS-9994
Change-Id: I5675368368f2d1cc513feb98fdcdd75fda1a764a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2023-06-07 09:49:30 +00:00
Ali Kianian
69244a7a3a QmlDesigner: Fix the Crash on hovering bake lights icon 
Task-number: QDS-10043
Change-Id: Ic049f55c6fc7aa86e1b3c1ec036df5cd5f25673e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
 2023-06-07 09:25:00 +00:00
Jarek Kobus
c276a896b8 AndroidSdkDownloader: Do some reformatting 
Use #pragma once.
Use Android::Internal namespace.

Change-Id: Ic5ceef259fb2c333448f2ed48a10645d6945c029
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2023-06-07 09:22:37 +00:00
Marco Bubke
71e1a77197 QmlDesigner: Add removal for binding properties 
If an id is present in a binding expression and the node with that id is
removed we remove the expression is removed too.

Task-number: QDS-10018
Change-Id: I6c33005edcbcafbff7dd82af47977b238068eba1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2023-06-07 08:09:40 +00:00
Tor Arne Vestbø
27b630c3ab Replace Q_OS_OSX with Q_OS_MACOS 
Change-Id: Ibee0c259d7df86a8df58b1ad12549b145f715397
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2023-06-07 07:54:04 +00:00
Marcus Tillmanns
2d128e9c70 Debugger: Fix BreakpointItem::needsChange 
Change-Id: I75680eddb7a6c2ba23148b66cf8dfcc08b07eca2
Reviewed-by: hjk <hjk@qt.io>
 2023-06-07 07:50:25 +00:00
David Schulz
be0a129543 CMake: fix find link at 
Change-Id: I1afcd3bd2b4db53ff8284f9acbe2b07102e66205
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2023-06-07 07:38:16 +00:00
hjk
0d4a546397 Debugger: Use Utils::Text::Position instead of int line number 
The column is currently unused.

Change-Id: Iabc57c8d21e807187783071efe9a82e9c1877181
Reviewed-by: hjk <hjk@qt.io>
 2023-06-07 07:36:29 +00:00
Marcus Tillmanns
a3fb6a3a1c Debugger: Fix compile warning 
Change-Id: I77399e4f8260a043dbc429649fe33513d19fc91a
Reviewed-by: hjk <hjk@qt.io>
 2023-06-07 07:30:13 +00:00
hjk
adcf52e0c4 Fix some more *::count() deprecation warnings 
Change-Id: Ib7d1552a6f7b167e15beb7ca1ef26c7d57e090e9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2023-06-07 07:29:34 +00:00
Marcus Tillmanns
886ca55b5a Terminal: Fix warnings about re-registered action 
Especially on Linux the pointer value of the Terminal might be reused,
leading to warnings about actions being registered for the same context.

Cleaning up the registration fixes this.

Change-Id: Ie1d53bf79581e9f98576e7a4e70420ec63da0f86
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2023-06-07 07:25:13 +00:00
Marcus Tillmanns
ce7677a7d7 Kits: Sort kit parts by device 
Change-Id: I00e1db4897071ac6baf97c5bb6214c2658a7b9fb
Reviewed-by: hjk <hjk@qt.io>
 2023-06-07 07:19:19 +00:00
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
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
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