Commit Graph

87591 Commits

Author SHA1 Message Date
Burak Hancerli
14a191018a QmlBuildSystem: Fix absolute import paths
Task-number: QDS-12732
Change-Id: Ic299731e1bc9b98bc4da82dbb20f6a75299ce72d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-05-14 09:17:40 +00:00
Mahmoud Badri
5bf8845c42 QmlDesigner: Add UniqueName::getpath()
Also relevant tweaks in the same class

Change-Id: I59ca0839a28478028b8aa36b9df500f29d831b90
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-05-14 08:24:07 +00:00
Mahmoud Badri
f7a39ed57b QmlDesigner: Use UniqueName util in the assets view
Change-Id: I1e27cb55fd1085f36ba8b6b38829baef49040c29
Reviewed-by: Shrief Gabr <shrief.gabr@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-05-14 07:43:23 +00:00
Eike Ziller
717a6ce8a0 Bump version to 13.0.2
Change-Id: I69a59c32fbfe699c788c15e64557a9a02b4c186c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-05-14 06:55:08 +00:00
Mahmoud Badri
54879113f1 QmlDesigner: Ensure unique content lib user item icon names
Also update user materials model to have the improvements
done to the 3D model. Also trying to make the 2 mdoels
as similar as possible to make it easy for further
future refactoring.

Change-Id: I5a32e1dcd7919bdf3cb638b068b0cdb5d4afecd9
Fixes: QDS-12736
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-05-13 14:48:15 +00:00
Henning Gruendl
e86814c491 QmlDesigner: Fix Connection editor closing
Pick-to: qds/4.5
Task-number: QDS-12013
Change-Id: I8add3418bb43b87e45153c012353646833413664
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-05-13 14:10:33 +00:00
Henning Gruendl
c29f514543 QmlDesigner: Fix ColorEditor closing
Fix ColorEditorPopup closing when opening gradient dialog.

Pick-to: qds/4.5
Change-Id: I438bd41d2efff30b372c04bc17c85210811cd0ff
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-05-13 14:09:23 +00:00
Ali Kianian
924019e8c2 QmlDesigner: Use GeneratedComponentsUtils in Model Editor
Change-Id: I567c746eb098c0c64d590ea7fed71f17de5adc76
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-05-13 13:49:22 +00:00
Mahmoud Badri
21f00445be QmlDesigner: Add UniqueName class
The class is used for generating a unique name anywhere in QmlDesigner
codebase. The role of this class is generation of next candidate name
when name is not unique. Actual checking of name uniqueness is provided
as a function param.

Also applied the new UniqueName on 1 usecase in
ContentLibraryUserModel::getUniqueLib3DQmlName

Change-Id: I777aeef7c269bed7d999695cf5fcee6a5576222b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-05-13 12:32:56 +00:00
Tim Jenssen
cf614eca91 StudioWelcome: silent splashscreen if there is a dialog open
Pick-to: qds/4.5
Task-number: QDS-12713
Change-Id: I206f132f526928fb02ea8d2f117c0ba19c08156e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-05-13 10:59:27 +00:00
Teea Poldsam
d1c8695974 Doc: Update Designing Application Flows
Fixes: QDS-11403
Change-Id: Iee8d9387244f9f7099119ece5124f976b0ebf00e
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-05-13 10:44:30 +00:00
Mahmoud Badri
4f23a553d1 QmlDesigner: Enable content lib user 3D context menu
Also some relevant tweaks.

Change-Id: I7bace9ce6bd7b45951cc18f7175b4646251196f0
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-05-13 09:25:18 +00:00
Eike Ziller
6075904af5 CMake: Fix library build path for MinGW
The code that handled the MinGW case of libFoo.a -> libFoo.dll
broke the case of libFoo.dll.a -> libFoo.dll that is handled
by the code before that.

Amends 0d8a542b4f
Amends 8713919f31

Fixes: QTCREATORBUG-30556
Change-Id: I76f60c5e646bce97169b205860babf6a0d3b08b6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-05-13 08:53:38 +00:00
Christian Kandeler
67e233fefc Update qbs submodule to HEAD of 2.3 branch
Change-Id: Icdbfaf63f9c8e37c00a735c22f6487ec9dd8975b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-05-13 08:44:35 +00:00
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
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
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
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
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
Aleksei German
11802e70d3 QmlDesigner: Fix for ColorEditors Pickers Canvas
Pick-to: qds/4.5
Task-number: QDS-12714
Change-Id: Ie8a6b8be88f4f020cbc82f66015dc7db76d14f56
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2024-05-07 15:13:42 +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
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
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
Teea Poldsam
dd10b5972c Doc: Fix QDS doc warnings
Fixed some links and one command issue.

Fixes: QDS-12704
Change-Id: Ie281718675cc3a71d02248096a57a5dceffce512
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-05-07 06:13:13 +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
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
Teea Poldsam
5201e51d98 Doc: Fix language in 3D view doc
Fixes: QDS-12701
Change-Id: Iae97930bb671fcc9f9b2a7e1cf8a6e2ab60ee3c1
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2024-05-06 10:30:24 +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
Teea Poldsam
61d936af89 Doc: Update Reacting to External Events
Fixes: QDS-11507
Change-Id: Id6ba8895ee4141127feb199c7db05c26dcc9473d
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-05-06 09:05:14 +00:00
Aleksei German
09dcb1d730 QmlDesigner: Enable MCU Gradients in ColorEditor
Specifics using ColorEditor should be able to use new MCUs-specific property

Task-number: QDS-12691
Change-Id: If4d6b1241744ccbc7a9df8b7752ce4ab40502d43
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-05-03 16:15:56 +00:00
Aleksei German
77827660e1 QmlDesigner: Bump MCUs metadata
Task-number: QDS-11588
Change-Id: Ib1e5212406a856f32611d0a43d603e7c31a605c0
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-05-03 16:15:10 +00:00
Christian Kandeler
732f37685c Update qbs submodule to HEAD of 2.3 branch
Change-Id: Ib3182e394222e4323982983b557cabbc60e1c0d8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
v13.0.1
2024-05-03 14:11:14 +00:00
Pranta Dastider
c985be4516 QmlDesigner: Update the supported image list in the QDS doc
This patch update the list of supported image formats
in the documentation of Qt Design Studio.

Fixes: QDS-12688
Change-Id: I9280eeb5e8d37e1d51ef5c6bcb2917d81bdede80
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2024-05-03 13:37:21 +00:00
Pranta Dastider
1b5ef0420b QmlDesigner: Update the supported image list in the QDS doc
This patch update the list of supported image formats
in the documentation of Qt Design Studio.

Fixes: QDS-12688
Change-Id: I5628b4d378447f0caa074e7264a3a4e5ee99b73c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-05-03 13:14:09 +00:00
Thomas Hartmann
0f2d15f16c QmlProject: Also add support for gif
Change-Id: I46400e8bd605142401ab941e45baba1fa4b27fc0
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-05-03 13:04:15 +00:00
Miikka Heikkinen
df20f8924a EffectComposer: Fix slider value precision
Effects with slider controlled real values now properly cut the values
to two decimals.

Fixes: QDS-11773
Change-Id: I056a295e5a126536d3003490c938361e4ce382b3
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-05-03 12:59:49 +00:00
Miikka Heikkinen
3f48d2bb7e QmlDesigner: Use SceneEnvironment background by default
"Use Scene Environment" is not default option for 3D view background.

Fixes: QDS-12414
Change-Id: I5981b5d77a044c5f2d250c5c1ccdf307a7764108
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-05-03 12:43:16 +00:00
Mahmoud Badri
4366ed9aa2 QmlDesigner: Add missing bundle types to GeneratedComponentUtils
Also small refactoring.

Change-Id: I54f1309aa69daf1d61b931063bb4b86612642cc1
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-05-03 12:16:49 +00:00
Miikka Heikkinen
d9e4a205d2 QmlDesigner: Fix IconGizmo multiselection
Clicked signal was directly connected to handleObjectClicked function,
but it had different number of parameters, leading to multiselection
parameter to always being undefined.

Fixes: QDS-8137
Change-Id: If065531878df9ad7e6584c89dce19b6b7d71a676
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-05-03 10:53:16 +00:00
Thomas Hartmann
96bfa8e29f QmlDesigner: Support for ExtendedSceneEnvironment.GlowBlendMode
This is the first nested enum scope. Therefore we have to add support
for nested enum scopes.

In a subsequent patch, Enumeration has to be adjusted. This patch is
minimizing the risk for QDS 4.5.

Task-number: QDS-12645
Change-Id: I6ddfa89f3a3038eac8a7ce73c8c593191fa05b84
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-05-03 09:43:36 +00:00
Miikka Heikkinen
6cec311c5d QmlDesigner: Fix url property path resolving
Converting file:// urls to relative paths assumed that the file://
url would always point to a file that is in same or child folder of
the qml document, which broke for urls that pointed under generated
components folder.

Fixes: QDS-12029
Change-Id: I352ba01650ebf6c1c5fedef9323bf27b44491736
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Shrief Gabr <shrief.gabr@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-05-03 09:31:47 +00:00
Teea Poldsam
854319bd7d Doc: Add the new fly mode spacebar shortcut to 3D doc
Fixes: QDS-12339
Change-Id: I885fd118a5349adb4907d0dbf518101498daa5ea
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2024-05-03 08:56:22 +00:00
Miikka Heikkinen
39fed3759c QmlDesigner: Show crosshair only after there is a move in fly mode
Fixes: QDS-12596
Change-Id: Id34ad1b0745814a5b3dee8b6c3001d19ca7f4118
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-05-03 08:38:58 +00:00
Miikka Heikkinen
cb0e28d2e6 QmlDesigner: Start requested timer when it's created in 3D view
Fixes: QDS-12659
Change-Id: I78f5854185e4efebc00ea63c5dd290dc851e21eb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-05-03 08:38:50 +00:00