Commit Graph

72811 Commits

Author SHA1 Message Date
hjk
714cedf945 Core: Hide About dialog definition in .cpp
Change-Id: Ic8bd2535868319eb78ba61e90f35bf63b74b7b2e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-31 15:14:14 +00:00
hjk
10b17940c8 ProjectExplorer: Make RunControl final
This makes later reasoning on what can (not) happen in the destructor
easier.

Change-Id: Icec12738e37c95d8d318d0d8fc2bc9b0b60e436d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-07-31 14:12:26 +00:00
hjk
1865cd2e02 Core: Hide PluginDialog definition in .cpp
Change-Id: I31302589bcc0c167f7115880dc646704f220450b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-31 14:05:18 +00:00
Christian Stenger
ad42cf0dae PE: Fix compile with older Qt
Otherwise meta object system complains.

Change-Id: Ibb929e7341aac92b8272d9647d25e88bb9668319
Reviewed-by: hjk <hjk@qt.io>
2024-07-31 14:04:59 +00:00
hjk
f752989f83 ProjectExplorer: Move AppOutputPaneSettings closer to AppOutputPane
And make CloseTabMode private.

Change-Id: Ia53fb6d06da59e8fe66020194b6b670868ef83e4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-07-31 13:29:24 +00:00
Marcus Tillmanns
a414dece1f ExtensionManager: Improve Install step
Change-Id: I1668aa41a78fa9a0b6bd4505566268359746c4c7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-31 13:25:09 +00:00
Eike Ziller
c0fd0ab7b3 Welcome: Show open files in summary if there are no projects
In expanded items in the session list in Welcome mode.

Adapt the project display too: We showed the base name of the project
file as the project "title", which is "CMakeLists.txt" for all CMake
projects, and also for other projects doesn't really add interesting
information over the file name that we show.

If there are projects in the session, show a title "Projects" and the
list of open project paths.
If there are no projects, but open files, show a title "Files" and the
list of open file paths.
Limit the list of paths to 5 in both cases (adding "..." if there are
more).

Fixes: QTCREATORBUG-7660
Change-Id: I2e250c54f88932aaa95b926f60e0005da9c7a89e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-31 12:34:53 +00:00
Eike Ziller
55615f63f7 EditorManager: Split reading the settings from actually doing anything
So we can add reading the settings just to retrieve a file list in a
second step.

Task-number: QTCREATORBUG-7660
Change-Id: I65856ab97bfe2ee69194d484926f83621fa85327
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-31 12:34:25 +00:00
Ali Kianian
ace48d4b7f QmlDesigner: Read and apply minimumVersion for material bundles
If `minQtVersion` exists for a material in material_bundle.json file,
and kit version is less than `minQtVersion`, the material should be
skipped.
Version class has improved and moved to QmlDesignerUtils.

Task-number: QDS-13274
Change-Id: I726c1765c69e5b080650099d0b811a90cfc3ccf5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2024-07-31 12:01:56 +00:00
Christian Kandeler
1b2493259c CMakeProjectManager: Fix warning
"loop variable ‘var’ of type ‘const QByteArray&’ binds to a temporary
constructed from type ‘const char* const’ [-Wrange-loop-construct]"

Change-Id: I663dcb0c990ee125be9b90640e2925014f7166d1
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-07-31 10:43:47 +00:00
Alessandro Portale
61c19d78ff Debugger: Move "beetle" overlay on the mode bar action down by 1 pixel
Change-Id: I5b41e4a58069f4aef67a6c46c18a7a3f725b2e7c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-31 10:43:22 +00:00
Eike Ziller
762c701e55 EditorManager: Remove unused return value
Change-Id: I13348a14c560251eac019c6f7c230191af4367ed
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-07-31 10:37:18 +00:00
hjk
7145dde235 ProjectExplorer: More private and final for AppOutputPane
Q_OBJECT is also not needed.

Change-Id: Ic79232b5097b6619ecc356b02f31671120596103
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-07-31 10:35:24 +00:00
Mahmoud Badri
9a85110f91 QmlDesigner: Add icons for lights and cameras when added to content lib
Also small relevant tweaks.

Fixes: QDS-12903
Change-Id: If9d4c9c34005ca0853ec8bda52ebb0234a2223e8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Shrief Gabr <shrief.gabr@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
2024-07-31 09:51:50 +00:00
hjk
84c42a7fea ProjectExplorer: Move some AppOutputPane related stuff
... closer to AppOutputPane.

Change-Id: I6b6d6d8d7522e380b7c69efd6ec5d816ae0fb324
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-07-31 08:49:26 +00:00
Eike Ziller
5723c68b5f GoCmdBridge: Fix issue when 'go' is not in path after configuring
Use the full path to the 'go' executable instead of assuming that it is
in the PATH, like already done for upx.

Change-Id: Ic28c4d0b729a66bc4917c1133d4b91b9c2c019eb
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-07-31 08:09:12 +00:00
hjk
bf0041919b Debugger: Replace QVector with QList
The QContainer Naming War is over. QList won.

Change-Id: I8193b1b51619502533b74d6e965ec9b664f8dbce
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-31 07:47:02 +00:00
Christian Stenger
35deb730cb Lua: Fix include
Amends 61bb8d8e51.

Change-Id: I044243a3efa6ad5963cee088535dac0db5bf2d30
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-07-31 07:41:46 +00:00
Marcus Tillmanns
61bb8d8e51 Lua: Macro support
Allows users to use "%{Lua: ...}" to execute Lua code in their macros.
Adds "Macro" module with expand() and value() functions.

Change-Id: I6315b0646fbb503a77fd0cc631aed204abf3b699
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-07-31 06:53:46 +00:00
Christian Stenger
aed3eee06a Debugger: Add action do debugger tool bar
The action for disabling or enabling all breakpoints
is quite hidden inside the context menu.
Make it more obvious by adding something similar to
the debugger tool bar.

Change-Id: Iedd1a03912eeca635ebc41b067ec785bb55d3474
Reviewed-by: hjk <hjk@qt.io>
2024-07-31 04:48:19 +00:00
Cristian Adam
04b9c08153 CMakePM: Mark CMake modules from prefix path as generated
This will result in "Project View" the "CMake Modules" folder to be
hidden if it only contains CMake files from CMAKE_PREFIX_PATH or
CMAKE_FIND_ROOT_PATH.

Users of QtQuick or Qt Widgets applications will no longer have to see
the "CMake Modules" with "<Other Locations>" and the paths to the Qt
CMake files.

This way the CMake projects will resmble the QMake projects.

Change-Id: Icde9a556be5bceccdb4abb11072fbd17b59dce4d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-30 16:39:44 +00:00
Cristian Adam
59ce9dc04b CMakePM: Fix saving "Initial Configuration" values
Amends 6c5717844d

The CMakeBuildSystem::clearCMakeCache() would call
BuildSystem::emitParsingFinished which would clear the configuration in
the widget, effectively removing any "Initial Configuration" changes when
clicking on the "Re-configure with Initial Parameters" button.

This commit makes sure that the updateInitialCMakeArguments() function
is called before CMakeBuildSystem::clearCMakeCache(), and that only the
"Build > Clear CMake Configuration" action would
"disableCMakeBuildMenuActions" which is what an user would expect.

Fixes: QTCREATORBUG-31320
Change-Id: Ie7810c9bed000ca19a31a6ab8e7a281ae9f5e6f0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-30 16:39:16 +00:00
Cristian Adam
5dccb8072c CMakePM: Allow slashes for CMake "FOLDER" separators
Previously only backslashes were taken into consideration. Now also
slashes, since CMake supports them for Xcode and Visual Studio
generators.

Fixes: QTCREATORBUG-31305
Change-Id: I096540769ee53ce7c30c0543d1bd250f098ac19c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-30 16:38:49 +00:00
Cristian Adam
76dcc069d6 CMakePM: Add source groups to auto-setup.cmake
The CMake "Resources" source group is being extended with "*.qrc *.svg
*.gif *.ico *.webp"

The "Forms" and "State charts" are taken from QMake and group "*.ui" and
"*.scxml".

Fixes: QTCREATORBUG-31308
Fixes: QTCREATORBUG-31312
Change-Id: Ie83c185769637f70731ef775cda16a61de708b20
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-30 16:04:02 +00:00
hjk
f0c2239fa3 Core: Merge actionmanager/commandsfile pair into their only user
Also, de-QObject-ify and inline the Context wrapper structure
for the key strings.

Change-Id: I21f3afec61ef9ecfcc4c3d89afb9fb3a1548afae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-07-30 14:28:21 +00:00
Marcus Tillmanns
8974d844ff Lua: Introduce LuaCompatibleVersion
The new field "LuaCompatibleVersion" is required when a lua plugin depends on a C++ plugin. A dependency will be fulfilled if:

"LuaCompatibleVersion <= dependency.version <= Version"

Change-Id: I61466055a56e20abbb1fa5f73a5735a0e3a4c471
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-07-30 13:11:01 +00:00
Christian Stenger
671365b0a0 CppEditor: Avoid nullptr access
Fixes: QTCREATORBUG-31318
Change-Id: I1728902346ce2f4d7346b71305e2e9d87abf62db
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-07-30 13:07:49 +00:00
Marcus Tillmanns
8c91d12ca1 Copilot: Fix crash when closing settings while checking state
Change-Id: I06a9df91690fcdea8f30e9f9f6b5a38dfe19c8ea
Reviewed-by: hjk <hjk@qt.io>
2024-07-30 12:03:33 +00:00
Christian Kandeler
e75b9f32a9 ProjectExplorer: Make custom toolchains C/C++ only
That's what they were intended for. There appears to be no use case for
them to represent e.g. a nim compiler.

Change-Id: I8070fb837fe411c3e2b6e5a335e642497437896d
Reviewed-by: hjk <hjk@qt.io>
2024-07-30 11:42:12 +00:00
Christian Kandeler
5baead5eda Android: Properly specify the supported toolchain languages
As one can easily see in the toolchain settings page, there are Android
C compilers, so don't claim the factory supports only C++ toolchains.

Change-Id: Ib84b7a70ef3359a7143e3f320fdb2cc913bfb24b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-30 11:41:52 +00:00
Marco Bubke
d079385d81 QmlDesigner: Fix build
Seems the CI don't catched it.

Change-Id: I0a68080162740cabc7c2ee63927abd185e02ce5a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-07-30 11:39:30 +00:00
hjk
fd4fb01a23 Android: Merge splashscreenwidget related file pairs
Change-Id: I8b21fff7954aa279cbf852ab07f837187ac9ce77
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-30 11:34:19 +00:00
hjk
4137b6fc19 Android: De-QOBJECT-ify androidmanifesteditor.cpp
Change-Id: I90d7704d9a6d45bd26caa0649b0b78acb04bfd4d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-30 11:34:13 +00:00
hjk
23959208c2 Android: Make AndroidManifestEditor have a AndroidManifestEditorWidget
As the IEditor interface suggests, not the other way round.

This way the widget doesn't have to know about the editor.

Change-Id: I49e69047544dc89efdbcff51f2550ca827072c91
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-30 11:34:06 +00:00
hjk
0811754fb9 Android: Hide AndroidManifestEditorWidget definition in .cpp
Smaller visible interface.

Change-Id: I3baae92bbc13f6ad4231b21b074d030877a701a6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-30 11:33:59 +00:00
hjk
23ff4e838a Android: Merge androidmanifestdocument.* into androidmanifesteditor.cpp
Change-Id: I09ef23d740cefbc49d9c24f0d32cb185029abef0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-30 11:33:53 +00:00
hjk
d79c9fe044 Android: Merge manifesteditorwidget.* into manifesteditor.* (2/2)
Rename the merged content in manifesteditorwidget.* to
manifesteditor.*

Change-Id: I417b427ea7ecbe1f76364a08981a45cfef2ca562
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-30 11:33:02 +00:00
hjk
e9fa336491 Android: Merge manifesteditorwidget.* into manifesteditor.* (1/2)
This is the first part, actually merging the opposite direction.
Second part will rename the result. This are, also in total, much
smaller patches then doing it directly.

Change-Id: I76cf3e3b5d71390c746aeff6b412d535ea7f520f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-30 11:32:40 +00:00
Marco Bubke
ab7225c6d2 Vcpkg: Prefer environment variable over executable path
The executable can be in a different directory.

Change-Id: Ie630d464734d1ef9d0a9e1adfb8da8e56c67b5dd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-30 10:43:25 +00:00
hjk
4fa0a2d3ca QmlDesigner: Fix navigation factory name display
Amends 79612417e3.

Translating the id() does not work this way, lupdate only handles string
literals within tr(...).

As the factories already have a string meant for display, use that.

Change-Id: I335ac1d4b8984d0db7f7a6bea8a906bd39ca4864
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-07-30 08:35:29 +00:00
Marcus Tillmanns
e37796d1c6 ProjectExplorer: Fix uses of "FilePath::toString"
Change-Id: I7199dec620b7e09765c44b571b93575eda5c5a74
Reviewed-by: hjk <hjk@qt.io>
2024-07-30 08:26:09 +00:00
Marcus Tillmanns
b4250871ec DocumentManager: Use FilePath::watch() instead of QFileSystemWatcher
Change-Id: I9fcbbc62366f3191bfca3ecce937ad11109e885c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2024-07-30 08:05:41 +00:00
Marcus Tillmanns
efa20f528f ProjectExplorer: Escape summaries
When the arguments contained html-tag like parts (e.g. "<br>") they would disappear from the summmary.

Change-Id: I7e286ef439af2883152a147aad55f2b9bea6e2d3
Reviewed-by: hjk <hjk@qt.io>
2024-07-30 08:03:01 +00:00
Jarek Kobus
54d3742fc0 Android: Move intent and package names creation into worker
Remove packageName arg from AndroidRunnerWorker c'tor.
Remove setIntentName method.
Remove m_packageName field from AndroidRunner.

Change-Id: I09f901a0db110e1deeeff5b26aef12caca0467dd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-29 15:05:48 +00:00
Jarek Kobus
bd493d7e5a Android: Get rid of intentName arg
It's always empty string.

Change-Id: Id270e7fb128bfac414929e3eb611eb26beeb3624
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-29 15:05:04 +00:00
Jarek Kobus
73d2249960 Android: Small cleanup in AndroidRunnerWorker
Remove unused constant and forward declaration.
Use nested namespaces.

Change-Id: Iccb7e2a836b38290da38c40532ebafc4b07c25a2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-29 15:03:38 +00:00
hjk
8e1491f8fa Android: Merge androidmanifesteditorfactory.* into androidmanifesteditor.*
Change-Id: I965d9667e0035f022774078894a9e8a9f3342db7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-29 15:03:03 +00:00
Jarek Kobus
5e46ff6cc3 Android: Refactor part of asyncStartHelper() into recipe
Change-Id: I2bda72784ef5c0512f0a48b02c9f49da57a597df
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-29 14:46:25 +00:00
Jarek Kobus
0067d5a445 Android: Introduce removeForwardPortRecipe()
It's going to be used in couple of places.

Change-Id: I21c7724da03fb1d294d53fbb372ca4b909a3a842
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-29 14:43:59 +00:00
Jarek Kobus
e42c68a3b2 QmlDesinger: Replace some [&] captures with [this]
Change-Id: Idb53feea3c8961c0343a147d8a71bf692af7847a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-07-29 14:40:08 +00:00