Commit Graph

72811 Commits

Author SHA1 Message Date
Thomas Hartmann
e4bdb92d0f QmlDesigner: Fix adding keyframe
Keyframes were always added on the selected model node
instead of the modelnode belonging to the property.

Task-number: QDS-12622
Change-Id: Iae44cfecd862d79b14c062854d5f329da595f729
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2024-05-13 08:02:46 +00:00
Marcus Tillmanns
1c04192c51 Lua: Add waitms test
Change-Id: I281f0a5595140ff450e1a30e189286e1a5d8cf9d
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-05-13 07:24:19 +00:00
Jochen Becher
76f2b6d5e1 ModelEditor: Use Utils::FilePath
More replacements of QString with Utils::FilePath and removal of
QFileInfo and QDir will follow.

Change-Id: Iceec1c009c562bd9a05f9ab1d1a9f83ad48a4467
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-05-10 18:50:22 +00:00
Jarek Kobus
99acd3247f Android: Simplify create avd command
Simplify the code copied from the original place.

Amends be222eaff4

Change-Id: Ie90da2c2c515b948d0e1321a2c8fb8f7d48b9eb8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-10 16:44:41 +00:00
Alessandro Portale
6fea65f029 Android: Support "android-desktop" device definitions in AvdDialog
Change-Id: Iec80fe8b46302adeb1308d41da77e0a489c9c95e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-05-10 16:07:01 +00:00
Mahmoud Badri
c1172ced98 QmlDesigner: Allow saving a 3D node to the content library
Fixes: QDS-12393
Change-Id: I3112244bcbe74ea0f8f2eda8ccb6ad7470ca0e1e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-05-10 14:35:32 +00:00
Burak Hancerli
99fcb5c14b QmlPuppet: Fix the debug messages
Change-Id: I2b1d969a665863232a8d60a943fce87b6bb4dd3c
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-05-10 13:38:41 +00:00
Christian Kandeler
38153e34f3 RemoteLinux: Fix rsync command-line construction
Fixes: QTCREATORBUG-30795
Change-Id: I1311e9a9cfe9c3f6c5a4c3166a504eb27f652f9f
Reviewed-by: hjk <hjk@qt.io>
2024-05-10 13:13:58 +00:00
Jarek Kobus
be222eaff4 Android: Simplify execution of createAvdCommand()
Don't create a separate thread just to blocking execute it
from the caller thread. Use runBlocking with event loop
enabled instead.

Change-Id: I9930d91d25ef4d1af1062570db1cfe20a1c4ca2b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-10 12:46:46 +00:00
Ali Kianian
18febc9d76 QmlDesigner: Support more json structures in Model Editor
* A visitor is added to detect the property order of the nested json
models.
* A pure json object is defined as a json which does not contain any
array or object as its member.
* All of the json lists which has pure models, will be imported.
* A pure object which is a child of another object, will be imported.

Fixes: QDS-12546
Change-Id: Ib44e1567e3dde0fc5cb433b4f1dc20358e6a3949
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-05-10 08:36:50 +00:00
Burak Hancerli
542520e31c QmlProjectManager: Fix include paths
Change-Id: I1f5b0089e8d31d96682401a87bfd21eb3f4880f5
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-05-09 09:17:49 +00:00
Cristian Adam
1fb5b54221 PE: Fix ProjectTreeWidget::expandedCount not to use 0 for error cases
This would make ProjectTreeWidget::nodeForFile pick the wrong node due
to nodeExpandCount having a lower count.

In case of qml files there is the source file node and the resource file
node pointing to the same file name, but the resource name has an invalid
index (not visible in the project view) and shouldn't be preffered!

Fixes: QTCREATORBUG-30571
Change-Id: I2aff7da9dd6d83222e341b5cbcb78db5cd6a9224
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-08 15:16:15 +00:00
Burak Hancerli
dd20f54207 QmlProjectManager: Add initial support for multiple qmlproject files
This patch adds read-only support for sub MCU projects.

Task-number: QDS-12575
Change-Id: I0dc3b6ff37731f30875c03a3896bbabc4867c4fc
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2024-05-08 14:25:59 +00:00
Jarek Kobus
668e824299 Android: Remove SystemInfo from CreateAvdInfo
Replace it with sdkStylePath and apiLevel fields what makes this
structure safe to be used in different threads.

Get rid of isValid() method.

Change-Id: Iafce161457f05698fb3d5ea4a2a7fa15f8d95b38
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-08 13:36:41 +00:00
Marcus Tillmanns
f82a68221f Lua: Add helpful error message if await is called without async
Change-Id: Idc0b381a31ebe81709906e182d9a932e7ec7142f
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-05-08 11:37:11 +00:00
Jarek Kobus
3ead49ed33 Android: Make use of the error reported
Don't call createAvd() in case of the invalid systemImage().

Detect the erroneous result and handle it accordingly.

Change-Id: Ieb869d12ea24f22dcf29beb362d934484929cdad
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-08 11:18:50 +00:00
Christian Kandeler
6164937b42 CppEditor: Add quickfix for moving a class to a dedicated set of files
Fixes: QTCREATORBUG-12190
Change-Id: I8d23525c132f086992f030e56789eea3f7b136c9
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-05-08 11:02:37 +00:00
Marcus Tillmanns
9907c328f7 Lua: Add FilePath::(complete)Suffix and isAbsolute
Change-Id: Ifc9cc97b5c996a2bee8cd15d158411306dc3bd7d
Reviewed-by: hjk <hjk@qt.io>
2024-05-08 10:30:29 +00:00
Marcus Tillmanns
657ce51467 ExtensionSystem: FilePath'ify
Change IPlugin::fileName() and IPlugin::location to use
FilePath instead of QString.

Change-Id: If473ab1e258951735f93221cbd62c505f0727eb2
Reviewed-by: hjk <hjk@qt.io>
2024-05-08 10:29:59 +00:00
Dominik Holland
aad2f6ecac AppMan: Add PerfProfiler support
Change-Id: I7873742ebd93af1aed1c57e473c85d0b06bbbbf3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-05-08 08:17:14 +00:00
Dominik Holland
33271804d2 PerfProfiler: Add support for reading perf output from other processes
Instead of just using the "PerfConnection" property when a "PerfRecorder"
is started, it is now also possible to set a "PerfProcess" property
and read stdout and stderr from there directly.

Change-Id: I01bd60a7ef36ca1676c0e0bc3d1f3e87f08749a2
Reviewed-by: hjk <hjk@qt.io>
2024-05-08 08:17:00 +00:00
Dominik Holland
a90d16beda RunControl: Add more helper functions to SimpleTargetRunner
Allow to disable the forwarding of stdout and stderr and provide access
to the underlying Process.
This can be used when stdout and stderr need to be forwarded to other
RunWorkers.

Change-Id: I7fb789defe8a57831fcaf312fc7b500affdf2f61
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-05-08 08:16:43 +00:00
Marco Bubke
a7fd0a78d1 QmlDesignerProjectManager: prevent crash at destruction
found in https://the-qt-company-00.sentry.io/issues/5315357110

Pick-to: qds/4.5
Change-Id: Ie8d7358c246799c5883e52fbdadb6f3a5e2a4359
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2024-05-08 07:47:03 +00:00
Eike Ziller
ec8d86e954 Environment: Avoid calling throwing functions
We do not declare any `throws` and this way we can also use QTC_GUARD

Coverity-Id: 1586292
Change-Id: I75efd625e096bf02c1f7a85b9573bd134a9fb020
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-05-08 06:50:05 +00:00
Marcus Tillmanns
b36ddaf8ec Lua: Simplify waitms
Change-Id: I3832134f91580e8c1aa4a3ab62445feaba2009a4
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-05-08 06:06:23 +00:00
Mahmoud Badri
20da89dd07 QmlDesigner: Remove ContentLibraryWidget::findTextureBundlePath()
Unused method.

Change-Id: I021c9e3c0180245a826f375f14dd94350a209cfd
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-05-07 14:54:47 +00:00
Mahmoud Badri
09e012cbb7 QmlDesigner: Rename "Effect" to "Item" in the content library
Item includes any item except materials and textures

Change-Id: Icf981661dcd611638fe33fae18f65ad62a5e617c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-05-07 14:44:10 +00:00
Eike Ziller
edfe652a87 LanguageClient: Fix crash
Amends 770f1b0376

Change-Id: Idb490e0992d631af81d3da0cee682ebb87567077
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-05-07 13:48:45 +00:00
Tim Jenssen
ca43b1c0fa Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I524162811ad42e406d7b8e5f38e7043e776005e1
2024-05-07 13:31:11 +00:00
Christian Kandeler
4dc56046ee Designer: Do not default to Qt4 module names in include statements
Fixes: QTCREATORBUG-30751
Change-Id: Ieca6779aa40b55536f0ce07b1803ff7a1a31004c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-05-07 13:12:18 +00:00
Eike Ziller
7eb09ff0b7 Editors: Update navigation history when closing with the tool button
The code path for the global actions (File menu, shortcut) were adding
the closed document to the history, but the editor view local action did
not. Move the call one level deeper, so it is done for both.

That fixes Window > Go Back under some circumstances in which it didn't open closed files again.

Change-Id: I74bdb02209b8ac7bb7714d9a827e3a0c30a4c9e9
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-05-07 12:28:22 +00:00
Alessandro Portale
07d25f01c7 Utils: Pass QColor by &
Change-Id: Idef5659934c9de47fd879c73a0fe5dfcb890237c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-05-07 11:37:48 +00:00
Marcus Tillmanns
dced7ce913 CMake: Use theme colors for text prefix
Also uses new Utils::ansiColoredText() function.

Change-Id: I43e59f78eb47903fc273244a9cd4e9da9b68839f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-07 11:15:04 +00:00
Marco Bubke
fa07abf6d8 QmlDesigner: Rename ProjectData into DirectoryInfo
The design is now directory based. So the name should reflect that.

Task-number: QDS-12665
Change-Id: I7479c37357a4fd33f5f3b4c93d63d2fdd4ca6ef9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-05-07 11:08:53 +00:00
Eike Ziller
770f1b0376 LanguageClient: Avoid calling throwing functions
Similar to with std::optional we want to avoid calling throwing
functions for std::variant, which includes std::get.
In many cases this also avoids the chain of `std::holds_alternative` +
`std::get` calls. And we never declare any `throws`.

Change-Id: I14f62ddef921b6bee90226ea34d1ffa62629bdc3
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-05-07 10:41:32 +00:00
Marcus Tillmanns
d96615eee8 Utils: Add function to format colored text
Change-Id: I6ae4d113e0aca434e99d9864188187100c24e47d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-05-07 08:57:19 +00:00
Christian Kandeler
bb2d565ecc Utils: Fix output linkification
The case where links are combined with other formatting was not correctly
implemented.

Fixes: QTCREATORBUG-30774
Change-Id: Ie56a7f4c9a1f8a9b23848cc6fd4b7749bb6cecd7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-05-07 08:11:03 +00:00
Cristian Adam
5e4281dafe CMakePM: Add conan/vcpkg-dependencies to "Clear CMake Configuration"
This way one could really get a clean build as one would expect when
issuing "Clear CMake Configuration".

Change-Id: I7067bc4f6f858aeb408612eab5e658e637c0c957
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-06 16:26:04 +00:00
Cristian Adam
5cc8abd8bd CMakePM: Add "Clear CMake Configuration" to context menu
Fixes: QTCREATORBUG-24658
Fixes: QTCREATORBUG-30771
Change-Id: I6429e861a77663513ed3243396bdd67042c11faf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-05-06 16:25:49 +00:00
Marco Bubke
4b38f462f3 QmlDesigner: Cleanup QScopedPointer
std::unique_ptr is a clear super set of QScopedPointer with the same
behavoir. There is Utils::UniqueObjectPtr too which prevents dangling
pointer if the parent is set.

Change-Id: I16c88f51b69f005445a079be494b44506271e53b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-05-06 15:48:36 +00:00
Marcus Tillmanns
642ef026bd Lua: Add tests
Change-Id: Iac2a47498b9463d647ef131a908fd6b851295993
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-05-06 14:36:21 +00:00
Mahmoud Badri
688e697fc0 QmlDesigner: Add user 3D bundle to content library
Fixes: QDS-12391
Change-Id: Ia078e62274277774949b0fc6a679c17ddbf91968
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-05-06 12:45:23 +00:00
Marcus Tillmanns
81bc72c8a0 Lua: Cleanup
Moves LuaEngine creation into initialize()
Removes uneccessary PluginLoader class

Change-Id: I9eddbe4d0cba7ba3c7c1ce825ec18845de7d4654
Reviewed-by: hjk <hjk@qt.io>
2024-05-06 10:11:19 +00:00
Tim Jenssen
4279bdb31c QmlDesigner: fix crash at shutdown
Found at sentry https://the-qt-company-00.sentry.io/issues/4729592969

Pick-to: qds/4.5
Change-Id: I3e4903eebf5d328361a04f276659bd143eed0925
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-05-06 10:10:48 +00:00
Eike Ziller
3249b106e5 Make it possible to add wizards paths via plugin meta data
That makes it easy with Lua plugins, and is useful on the C++ side as
well.

Change-Id: I660956bed47e4c1e27a001ad8999d6701cda86ee
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-05-06 09:46:29 +00:00
Cristian Adam
6656204b1e App: Use 'fusion' style only on fractional dpi on Windows
On 200% on 4k screens there is no reason to use the 'fusion' style since
the 'vista' native one works perfectly fine.

Task-number: QTCREATORBUG-16095
Change-Id: I1ffd02891aa5ef30c0172edd949d63d4270400c4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-05-06 09:27:43 +00:00
Marcus Tillmanns
70dba4977f ClangTools: Remove unused variable
Change-Id: Ieff874cb6db24714a5a62fd3f59ea5d69c9358a8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-05-06 08:45:02 +00:00
Eike Ziller
ca3646daba C++: Do not freeze Qt Creator while checking file sizes
Before actually indexing files, the C++ model checks the files against a
file size limit (if set, which is the default).

Do not iterate over all files and check their size in the main thread.
If the files are on a device, this operation is not fast. Move the
filtering to the parsing thread itself.

Change-Id: I2202cc44c28f38159ca593db2399dde30f95f9bd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-05-06 08:42:45 +00:00
Eike Ziller
a79f02ca4a Merge remote-tracking branch 'origin/13.0'
Change-Id: I77d3656aec10063a90095d5299b85304692d8b32
2024-05-06 08:14:24 +02:00
Marcus Tillmanns
a8d6dde8e3 Lua: Change Process to directly use Async module
Change-Id: Ie91a308d55b06f35b2f2114a46b347d83e779db2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-05-06 05:59:46 +00:00