Commit Graph

88532 Commits

Author SHA1 Message Date
Christian Stenger
fb2a1ecd37 Android: Fix build before Qt6.5
Change-Id: Ie2b674edcbd12a9c10ca1875d96da50e02914fe8
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-05-30 13:23:41 +00:00
Christian Stenger
fcadc9a2b2 Wizards: Provide mechanism to skip pages
Our wizard infrastructure makes it hard to dynamically remove
or add wizard pages on the fly while using the wizard.
So, instead of removing pages and re-adding them on need
just provide a way to skip pages.
Skipping pages is provided with this patch limited to
wizards which are known to be sub projects.
For now this is just a preparation as no wizard actively
sets the property for being a sub project or makes use
of this mechanism.

Change-Id: I3efd079ccb5be2203d2b17b3765d9f178998d5f4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-05-30 13:23:10 +00:00
Eike Ziller
81aed65406 Meson: Fix crash after adding first meson/ninja tools
- start Qt Creator without any meson or ninja tools registered
  (also not auto-detected)
- add meson and ninja in the settings and apply
- open kit settings and select a kit

This would crash, because the constructor of the meson
ToolKitAspectWidget saw that there was no tool registered and triggered
setting the default tool. Doing that in the widget constructor results
in an endless loop because changing the tool triggers an update of the
kit which triggers an update of the ToolKitAspectWidget which doesn't
exist yet (because the constructor didn't finish yet), so it would be
created again which results in the same situation and endless recursion.

Do not change the selected value in the widget constructor. This is the
same logic as for the CMakeKitAspect(Impl).

Fixes: QTCREATORBUG-30698
Change-Id: I35d56018d8f02a2716dfac763fa86d4426393172
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-05-30 13:14:34 +00:00
David Schulz
f00394b371 TextEditor: avoid setting a null cursor on select all
Change-Id: If7ccdf1e1d4846b279305e30d3a990754f942128
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-05-30 11:43:43 +00:00
Christian Kandeler
9bdf8329a0 CppEditor: Consider unexpanded token ranges when refactoring
When moving or deleting pieces of code, we are normally interested in
the actual content of the file in the respective locations, not in what
any macros present there will expand to.
This supersedes commit 76ae5780c4.

Fixes: QTCREATORBUG-10279
Change-Id: I0fb547b23244cd5875e80c019a3595f3f9c33d52
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-05-30 11:04:18 +00:00
Christian Kandeler
0947cc1999 CppEditor: Blacklist another gcc-only option for clang tools
As per https://lists.qt-project.org/pipermail/qt-creator/2024-May/
009262.html.

Change-Id: Id8993f874c7bfc8d1cbdf03045a0f0f953d86ca4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-05-30 10:41:10 +00:00
Christian Stenger
876f131b84 Wizards: Allow showing and hiding for VCS elements
Preparation for being able to hide the VCS UI elements for
sub projects as they derive anything related from the parent
project.

Change-Id: Id0cc951f313335d022b3370b24f10abfd6f7532a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-05-30 10:35:28 +00:00
Alessandro Portale
e9e37a7be7 EffectComposer: Fix copyright year in plugin metadata
Change-Id: I52742b05170a003a9dcc08eb1522a9e65825c96e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-05-30 10:12:26 +00:00
Eike Ziller
62c555acd7 COIN/GitHub: Use Qt 6.7.1
Also update the PRECHECK to use Qt 6.7 provisioning, so we get a
job that tests the Qt Creator build with tests disabled too
(on Windows).

And remove the 32bit Windows sdktool+cdbextension+wininterrupt-only
build, which is no longer done for 14.0

Change-Id: I49e5348c83e4cdd22797df559c448f962e005f15
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-05-30 09:10:46 +00:00
Assam Boudjelthia
b82da570cd Android: support namespace in build.gradle
The use of "package" in AndroidManifest.xml has been deprecated
since AGP 7.4, and has been moved to build.gradle file instead,
set as "namespace". Qt Creator has been relying on the package
name being present in the manifest and projects not having that
will fail to deploy. This change adds support of that to Creator.

Task-number: QTBUG-106907
Change-Id: I04850a11c5840d5167f7a3d09ae76cd51dbe72ca
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-30 09:01:54 +00:00
Marcus Tillmanns
fbb2f70747 Utils: Implement StringListAspect::addToLayout
Change-Id: I48806e397a8fa51c9b31860645a16c242e789a3d
Reviewed-by: hjk <hjk@qt.io>
2024-05-30 08:51:06 +00:00
Artem Sokolovskii
01e0e43443 Core: Reopen last closed editor
The short-cut to reopen the last closed editor is not set by default
to allow users to set by themselves.

Change-Id: I1f57e34c3b1a30873fd550f5cb008e5640e6a1c5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-05-30 08:03:41 +00:00
hjk
c96f502c6c Lua: Robustify LayoutBuilder integration
"Executing"  'Row { "a", b, "c" }' with unquoted b  previously crashed.

Change-Id: Ifb505c1a836a6041b05911e322cad596c3969e03
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-05-30 06:43:14 +00:00
Christian Stenger
8a90428251 Wizards: Fix updating path chooser
Do not update the path chooser from the same slot where the path
chooser gets validated or we end up inside a soft assert of the
path chooser's (locked) guard.
Currently no harm as the project chooser is not used actively
and no page is declared as a sub project on this page yet.

Change-Id: I641bb7da55de5919c772b1fa29693f4fa75d4a7c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-05-30 05:07:16 +00:00
Artem Sokolovskii
c14845181d ClangFormat: Fix indentation in the middle of line
Before, indentation applies in the middle of the line if an electric
 character is typed.
Now it happens only if the character is typed at the line's end or start
 and if new line character was typed. It should reduce jumping while typing.

Fixes: QTCREATORBUG-30731
Change-Id: I018cb4a03af5e6450be2cd423cb29bd384048871
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-05-29 15:54:04 +00:00
Cristian Adam
968051eb72 CMakePM: Presets: Add ability to register a Debugger via "vendor" field
This adds "Debugger" as a dependency for the CMake Project Manager.

The "vendor" field of a configurePreset can look like:

```
      "vendor": {
        "qt.io/QtCreator/1.0": {
          "debugger": "C:/Qt/Tools/mingw1120_64/bin/gdb.exe"
          }
        }
      }
```

or with all the DebugItem details as:

```
      "vendor": {
        "qt.io/QtCreator/1.0": {
          "debugger": {
            "DisplayName": "GNU gdb 11.2.0 for MinGW 11.2.0 64-bit",
            "Abis": ["x86-windows-msys-pe-64bit"],
            "Binary": "C:/Qt/Tools/mingw1120_64/bin/gdb.exe",
            "EngineType": 1,
            "Version": "11.2.0"
          }
        }
      }
```

Fixes: QTCREATORBUG-30836
Change-Id: Ia89ff29ce5fad713ee8617477ec798bd86f2f811
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-29 15:47:10 +00:00
Leena Miettinen
73e8dfba44 Doc: Remove the "Add WebAssembly kits" topic
This now happens automatically.

Task-number: QTCREATORBUG-30604
Change-Id: I205f57127333297ac53ae7276a683ffd70b10519
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-29 15:02:18 +00:00
Alessandro Portale
b6bda47ff9 Debugger: Remove left-over, now unused variable
Change-Id: Ie7829e102f80deaf658a03e748a17ad126973111
Reviewed-by: hjk <hjk@qt.io>
2024-05-29 13:57:32 +00:00
hjk
efae651924 Utils: Introduce a convenience function creatorColor()
... forwarding to creatorTheme()->color(...)

Change-Id: Iefaa043495127b3e500ed225584481d3ec0f8c1f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-29 13:49:25 +00:00
Artem Sokolovskii
d41f15390f ClangFormat: Fix indentation after closing parenthesis
Indentation was incorrect when closing parenthesis
 was typed in the function and empty function is below.
Now it indents as expected, test case was added.

Fixes: QTCREATORBUG-29911
Change-Id: Ic1ccf8cecb0d5723e6ab1a77177d8161119f6a54
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-05-29 13:04:10 +00:00
Christian Stenger
b5dd1330e4 Wizards: Let wizard know its supported project types
Preparation for later to make sub projects aware of the projects
they may be added to.

Change-Id: I95630adca6f756377d939b6c3169ada2c5a93236
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-05-29 12:45:23 +00:00
Christian Stenger
26030bf0a8 Wizards: Only show error message if not empty
The path chooser may be invalid while initializing the page
and shortly display the empty message before becoming valid.
At the moment no harm, as the path chooser is not used actively.

Change-Id: I0c0701c05262e35f550b40dcb03329b6e2308587
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-05-29 12:01:58 +00:00
hjk
ded8cf3fdb Lua: Make Layout-derived classes directly show-able
Change-Id: I2bea8187626c239b5b2e9ddb32d291db97ddc9ac
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-05-29 11:52:43 +00:00
hjk
a1146cbef4 Utils: Fix two deprecation warnings
QSize actualSize(const QSize &size, Mode mode = Normal, State state = Off) const;
    QT_DEPRECATED_VERSION_X_6_0("Use actualSize(size) instead")
    QSize actualSize(QWindow *window, const QSize &size, Mode mode = Normal, State state = Off) const;

Change-Id: Idfe068c7734ac92551b51c323e2cfb3bc221590d
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-05-29 10:37:12 +00:00
Cristian Adam
322944469f CMakePM: Add/remove CMake parameter for "Package manager auto Setup"
The CMake parameter is CMAKE_PROJECT_INCLUDE_BEFORE used in the "Initial
Configuration".

This commit will add or remove the above parameter in the "Initial
Configuration" list.

Previously, the parameter would have been added only on the first time.
Now with project CMake settings this is needed also for already
configured projects.

Change-Id: I7293032ef3e7e6e0ad0b51c68ef5fbe0cab48919
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-29 10:17:15 +00:00
Leena Miettinen
b4d345db2a Doc: Restructure "Building Applications for the Web"
Remove the requirements and link to Qt for WebAssembly docs.

Task-number: QTCREATORBUG-29361
Change-Id: I73b708953834fa0b239805c0ea10232c3fa440f5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-29 09:54:31 +00:00
Christian Stenger
62c1a6bee2 QmlProjectManager: Fix includes
Change-Id: I3368dc456dacc863a06821a614d3d40a2ac8000b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-29 09:24:17 +00:00
Christian Stenger
373ad2d9ba QmlPuppet: Fix build without Quick3D
Change-Id: I38bf66d61d3f40ecb2930290ee7966b653aea8a5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-29 09:14:45 +00:00
Alessandro Portale
8aa273a350 Android: Recover translations
One message was split into two. Easy to fix for us, messy for
translators.

Change-Id: I833d6f12caee2602c165a3d97d808458818fd0c8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-05-29 09:00:06 +00:00
Marcus Tillmanns
997f0fb624 Lua: Fix Layout.Span & Tab constructor
* Allows to use Span {...} or Span(...) syntax.
* Same for Tab {...} or Tab(...).
* Fixes some documentation issues.
* Adds "withFormAlignment()" and "spacing()"

Change-Id: I05ec0823617e99384e309f34a4861e29045eff94
Reviewed-by: hjk <hjk@qt.io>
2024-05-29 08:33:48 +00:00
The Qt Project
e7cf251abe Merge "Merge remote-tracking branch 'origin/qds/dev'" 2024-05-29 08:10:42 +00:00
hjk
91d0ca304a Lua: Fix off-by-ones in Layouting
Change-Id: I4b29ff453ab29a26ec2300f70c0d1232f30575f1
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-05-29 06:18:03 +00:00
hjk
4bf55f3239 Debugger: Fix some internal code model related dumper
Type.unqualified() is gone.

Change-Id: Iea3378e0ff4172c197ae8ad025a6ebcd58a2cbbe
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-05-29 06:17:41 +00:00
Jarek Kobus
96d4819138 Android: Use Qt::SingleShotConnection
Instead of disconnecting the signal inside the slot.

Change-Id: Ic5b47cd560d2737fb3b347b6c06e69889394e03a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-28 22:18:20 +00:00
Jarek Kobus
c9fac8ca2e Android: Transform AndroidConfig into namespace
Change-Id: I1926758f3dcaffb4de11a85c0873eec7bd2d223c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-28 22:18:12 +00:00
Jarek Kobus
665387bc6d Android: Rename setConfig() into applyConfig()
Get rid of the AndroidConfig arg.

Change-Id: Ifa828d4d9f382eb904d775bab890a801086b8a3b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-28 22:18:03 +00:00
Jarek Kobus
5dd3cff8ef Android: Remove unused methods, hide one method in private section
Change-Id: Ieeddf1ba1b0fca12deb2a3c4cb4d1344eede41ae
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-28 22:17:55 +00:00
Alessandro Portale
7bc65cf9f3 PluginSpecs: Change URLs from http:// to https://
Avoid the redirect that is inevitable nowerdays.

Also, change necessitas.kde.org to www.qt.io, since the orgininal page
is offline.

Change-Id: Ib1823f0df97d2df87822fd2bb7552e2f2c7e971e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-05-28 20:13:29 +00:00
Assam Boudjelthia
fadfddc905 Android: refer to ANDROID_SDK_ROOT instead of ANDROID_SDK in docs
Change-Id: I3087977486460823ab26d903976155c4799f8b6d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2024-05-28 18:25:42 +00:00
Assam Boudjelthia
27eba6d63f Android: remove note about minimum required Android SDK Tools version
Android SDK Tools version 25.2.5 has been released years ago,
and recent versions in at least the last 5+ years don't fit the
note, so no need to carry it around anymore.

Change-Id: Ieadbed612415863f5bc2dc13e274281c617e3a55
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2024-05-28 18:25:34 +00:00
Assam Boudjelthia
4f2d2ccdf8 Android: remove outdated note about emulator startup bug
This note has no details on what the bug is about, and in
any case, I'm not aware of such a bug in any recent version
affected by such a bug.

Change-Id: I32bb2a6ffa873630d3f884da3d8e2dbeb0a35648
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2024-05-28 18:25:27 +00:00
Cristian Adam
1a5f61adca CMakePM: Set CMakePM project settings via CMakePresets's vendor field
The field name is "qt.io/QtCreator/1.0":

```
  "vendor": {
    "qt.io/QtCreator/1.0": {
       "AskBeforePresetsReload": false,
       "AskReConfigureInitialParams": false,
       "AutorunCMake": false,
       "PackageManagerAutoSetup": false,
       "ShowAdvancedOptionsByDefault": true,
       "ShowSourceSubFolders": false,
       "UseJunctionsForSourceAndBuildDirectories": true
    }
  }
```

Fixes: QTCREATORBUG-25972
Fixes: QTCREATORBUG-29559
Fixes: QTCREATORBUG-30385
Change-Id: Ifac0d10eebda85f8d97e7a1387325a555101ea6d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-28 17:19:27 +00:00
Tim Jenssen
4515fba526 Merge remote-tracking branch 'origin/qds/dev'
Conflicts: src/plugins/qmldesigner/CMakeLists.txt

Change-Id: I250c8e5284ddb0f335c440999b8920762419c89b
2024-05-28 19:06:18 +02:00
hjk
fffa067a00 ClangCodeModel: Fix a qAsConst deprecation warning
Change-Id: I1a4bda015704d6012c8cde14084d51891b0dc0e2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-05-28 16:19:38 +00:00
Tim Jenssen
8790cbc9de Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I6dcba6ce7a9dec1c14dd6ad27732337c60eb7def
2024-05-28 15:14:38 +00:00
Cristian Adam
1712402b35 CMakePM: Add project CMake settings support
This is useful if projects do not to have "Auto Run" CMake or want to
have Junctions enabled.

Change-Id: I4a636e7bf64fe2d29d15d39fe9aa46807684c716
Reviewed-by: hjk <hjk@qt.io>
2024-05-28 15:03:42 +00:00
Jarek Kobus
97caf327ba LocatorMatcher: Use LoopList element with sub task tree
Change-Id: I92002426421f14ba5705c60418c4c0ac1fd6a7ea
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-05-28 14:05:40 +00:00
Eike Ziller
b92ef2c7e7 ProjectExplorer: Fix tracing scope name
Change-Id: I7a47e86b7fe2451ab418f094a5e65a63f9844d25
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-05-28 13:55:09 +00:00
hjk
8ec4acd775 ProjectExplorer: Save environment id after creation
Change-Id: I15e5515aa239d5cd6241444f9647869d9ea98a39
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-05-28 13:27:35 +00:00
hjk
ad2b0954d3 Lua: Add support for Layouting::Label
Change-Id: Id06f082262af1aed4e22d40790ad3ed6ba2b5dd9
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-05-28 12:52:35 +00:00