Commit Graph

76814 Commits

Author SHA1 Message Date
Tim Jenssen
f6cfe31c7f qmldesigner: increase restart timer
It was looping in debug on Windows so heaviliy
that it brought the system to hold then.

Change-Id: I10eccb6c48a22ba7a9de912a912f957066bf9c09
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 17:35:17 +00:00
Thomas Hartmann
6296b9a1a4 QmlDesigner: Add option for Always auto-format ui.qml files in Design mode
Task-number: QDS-8170
Change-Id: I6e345c69e60a19fd8eb7a505d7f64cb5fd664c88
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 17:31:59 +00:00
Thomas Hartmann
cbd96ef312 QmlDesigner: Fix crash
The timer can timeout after a detach.

Change-Id: I7eafe0a3d666942841cc0ee64d850acfab418c7c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 17:31:14 +00:00
Thomas Hartmann
626e1175a6 QmlDesigner: Do not specify version if it is -1 -1
Otherwise isBasedOn works differently than isSubclassOf for file components.
File components do not have a version.

Change-Id: If7009538ef97d119a348da99ed07919136c8b6e1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 17:30:42 +00:00
Vikas Pachdha
7a65a16718 Designer: Assert url scheme of the component
Type is not parsed if the url scheme is incorrect

Change-Id: Ia5cdf2887c73769a3c1bb6d8965426b0ff7e688c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-16 16:35:04 +00:00
Vikas Pachdha
913d0e079a Designer: Fix missing semicolon in case of dynamic properties
Fixes: QDS-5457
Change-Id: Ib6be3ec864ffb972010e25c2fa956695201dba2c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-16 16:34:59 +00:00
Eike Ziller
478ce3f4a4 QmlDesigner: Fix condition for adding QMLDESIGNER_STATIC_LIBRARY define
"$<BOOL:" interprets the following string, and does not expand variables
itself.

Amends 78cf5051f5

Change-Id: I50e09e699764a00091167e8c72045a0f9055160e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 15:37:26 +00:00
Tim Jenssen
0d2cb70fd6 qml2puppet: fix broken deployqtHelper_mac.sh
The extra subdirectory "qmldesigner" was removed
in cmake build scripts by last refactoring.

For other ui helper tools in libexec is already a
working qt.conf which can be reused.

Task-number: QDS-8308
Change-Id: I7e98d0187cf2748298da263e55a64918cbb6b2c0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-16 15:35:01 +00:00
Thomas Hartmann
301e7398d9 QmlDesigner: Fix ProgressParSpecifics
Task-number: QDS-8170
Change-Id: I5c9c4b1cb2751b89e7c1bb58c8f184dbbcf0623e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-16 13:48:04 +00:00
Henning Gruendl
57d3af6d89 QmlDesigner: Fix state group selection
The issue was caused by a mistake during branch merging.

Task-number: QDS-8244
Task-number: QDS-8245
Change-Id: Ib88f0c5201229295c0cec45d806917156bd86d9f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-15 16:12:17 +00:00
Tim Jenssen
a7cf52cc89 qmldesigner: cleanup connect
Change-Id: Id19c49d7ca7d9f19acf971ae005c868e50aec44d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-15 15:22:22 +00:00
Tim Jenssen
974c28ee77 qmldesigner: fix possible crash
Task-number: QDS-8246
Change-Id: I91cdf2887c73769adc1bb6d8965426b0ff7e6884
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-15 15:22:16 +00:00
Miikka Heikkinen
eae9be4218 QmlDesigner: Unify state handling on puppet reset
Form editor and 3D edit view changed state to base before issuing reset,
and form editor also changed it back to current state after issuing
reset, while all other resetPuppet calls do not change state.
Since puppet reset is asynchronous with small delay, the state changes
done by form editor did essentially nothing, and just changing to base
state in 3D edit view is wrong as we don't want reset to change the
state.

Removed state changes from puppet resets to unify the reset
functionality.

Fixes: QDS-8253
Change-Id: I33be3ec864ffb972010e25c2fb956695201db9ec
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-15 10:12:02 +00:00
Henning Gruendl
4c468e79f7 Update 3rdparty json
Change-Id: Ia6ecadac49eec73b1a3ccf8086aec42ccfea8f5e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-11-15 09:35:43 +00:00
Samuel Ghinet
873ca6d391 QmlDesigner: Fix scene environment color for 3D view
There were two problems:
* When the user checked "Use Scene Environment Color", the initial
  color set as background color was not the one configured in the
  "Scene Environment" clear color. The user had to change this color
  manually.
* If the "Use Scene Environment Color" is checked, then, upon the user
  clicking "Reset View", the background color was changed to a wrong
  value.

Also, fixed an error message in QML.

Task-number: QDS-7436
Change-Id: If42ef1a4532244f3326f5a27a082371aa77d78d8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-14 14:00:50 +00:00
Miikka Heikkinen
889e999f32 QmlDesigner: Clear material preview cache on detach
The previews are cached based on modelnode internal id, which can
overlap between documents, resulting in briefly showing incorrect
preview when new document is opened. Also, never clearing the cache
leads to leaking memory.

Fixed the issue by clearing the preview cache whenever all materials
are removed from browser (model detach and material library deletion).

Change-Id: Idad39fef62871c4e94f35604e643c7195ae9ec81
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-14 13:22:11 +00:00
Tim Jenssen
b10c135a10 qmldesigner: remove delayedResetView();
Change-Id: Ie577b6b686a10e4e3525ba858a70bea0b4077566
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-14 10:57:06 +00:00
Amr Essam
8c7ed5a03e QmlDesigner: Add effect placeholder icon
Placeholder icon until final icons are provided

Task-number: QDS-7713
Change-Id: Ic66f0603ed7088584ea0df6af9f977e732065d3c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-14 10:56:27 +00:00
Ali Kianian
63d30351a6 QmlDesigner: Add "Select Parent" to 3d Context Menu
"Select Parent" action is added to the context menu of the
Edit3DWidget.

Task-number: QDS-8199
Change-Id: Iff6ce50eba966bea60f1b09f497632c3ff290c27
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-14 10:54:19 +00:00
Jarek Kobus
a43f5db582 QmlDesigner: Drop static_cast from connections
These signals are not overloaded anymore in Qt 6.
Simplify widget creation in CurveEditorStyleDialog.

Change-Id: I4937db8c3dad10e7c0b2aa007739d71ae5992486
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
2022-11-11 15:53:27 +00:00
Henning Gruendl
1b6fd9f328 QmlDesigner: Update SpinBox
Update SpinBox to the state of RealSpinBox.

Change-Id: Ib4d622edbf3d3cfb22adc7b410a97f348e235270
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-11 14:43:40 +00:00
Henning Gruendl
ff5e6a154b QmlDesigner: Add hasSignalHandlerProperty function
Change-Id: If1616f87c4dfebc121aad842c0b35ae63ddc8dbd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-11 14:43:25 +00:00
Henning Gruendl
dbca9418ff QmlDesigner: Fix CheckBox spacing
Change-Id: Ie4b365e67886ee20dc6632da118c561d0e93c95f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-11 14:43:03 +00:00
Henning Gruendl
f7e7bcd877 QmlDesigner: Add link error switch in RewriterView
Add a switch in RewriterView to disable link error checks.

Change-Id: I6bac2c6c92872463c2246e67e803a6724973fae7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-11 14:42:45 +00:00
Henning Gruendl
cf86bc789f QmlDesigner: Add insight constants
Change-Id: I58f398a329b79a346061b192e2fbff40a9b9ec6d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-11 14:42:06 +00:00
Samuel Ghinet
61c133f48a QmlDesigner Fix: Select Background Color doesn't clear Environment Color checkbox
Task-number: QDS-7439
Change-Id: I5546e02f7cc2d0bcf3197f94a6ccc557cfb84e7b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-11 13:35:39 +00:00
Amr Essam
e3e5524f88 QmlDesigner: crash when dragging an effect twice to component in 2D
When an effect is dragged twice, same effect or other effect it caused
QDS to crash, in layer mode the effect is replaced,
otherwise effect is added upon previous effect

Task-number: QDS-8172
Change-Id: I2a3682b21492de0d0cc62bce9bd2965cedfbc826
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-11 13:11:15 +00:00
Miikka Heikkinen
8bb3c8f923 QmlDesigner: Don't cache possible imports until code model has settled
Code model can take a couple of seconds to fully resolve when a new
project is launched for the first time, so we avoid caching possible
imports until we detect no changes in the count of possible imports.

Fixes: QDS-8128
Change-Id: I0d35b1eb2d5872f646c141067652645d2e2f106f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-11 12:05:02 +00:00
Ali Kianian
455c84ccbf QmlDesigner: Add Duplicate to 3d Context Menu
Duplicate action is added to the context menu of the Edit3DWidget.

Task-number: QDS-8063
Change-Id: Id1347d28cd819a81e145bb0319e85d19a734090f
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-11 11:31:21 +00:00
Ali Kianian
a2b85953cf QmlDesigner: Paste to the clicked position
Copied items would be placed in the clicked position by the paste
action.

Task-number: QDS-8063
Change-Id: Iac4b6faacb0f429b826b144dadad3ec32f53580e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-11 09:28:11 +00:00
Thomas Hartmann
019e44ce27 QmlDesigner: Rename Projects to Project
Task-number: QDS-8127
Change-Id: I675db923474d1c02105bf9d308637368e00565cb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-11 08:46:51 +00:00
Thomas Hartmann
1f6511dba0 QmlDesigner: Fix findCommonAncestor()
Task-number: QDS-8247
Change-Id: Ia9d8c0728ebfae6e47acf7ff3a2823c8711549fc
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-11-10 17:08:23 +00:00
Samuel Ghinet
16dde463ed QmlDesigner: Remove "App" from the Components view
Task-number: QDS-8116
Change-Id: I9f578bf3081c9399eaf12c2f3d0aa3c27151a016
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-10 14:12:51 +00:00
Mahmoud Badri
cbea3f15ce QmlDesigner: Allow material browser texture selection
For now texture selection is independent from material selection.

Change-Id: Iffa8354948f0ce64e4a54458531274e0441e87ea
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-10 13:47:37 +00:00
Mahmoud Badri
bb64505cab QmlDesigner: Implement adding a bundle texture as light probe
Fixes: QDS-8205
Change-Id: Icb57287fa36df5d44d59ffc64e26fa3d778d24d6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-10 12:13:58 +00:00
Ali Kianian
08f8732108 QmlDesigner: Move nodes to a specific position
A list of nodes could be moved to a new position.
This is useful for positioning the visual items within the transactions
of the DesignDocument.
Paste to position is also available.
Paste method is modified by this commit.

Task-number: QDS-8063
Change-Id: Id5a295ee6a096952379e2b46d8e740d28562d5e9
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-10 10:33:57 +00:00
Miikka Heikkinen
7fe256ca32 QmlDesigner: Insert CubeMapTexture to correct prop in SceneEnvironment
Fixes: QDS-8169
Change-Id: Ic19430a25ad7e04e0e7c72c2dcc2991d30beac07
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-10 09:45:41 +00:00
Marco Bubke
cc690a407f QmlDesigner: Remove macos specific puppet path
We already removed it everywhere else.

Change-Id: Id71880474550ca4c5dfc26ef77db74455a44ca16
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-09 16:58:18 +00:00
Marco Bubke
7cfad17850 QmlDesigner: Fix warning for QQmlListReference
Change-Id: I18e2462d5d52d9c464de5510f86e8cb4da05cc1d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-09 16:57:58 +00:00
The Qt Project
f56420ee07 Merge "Merge remote-tracking branch 'origin/9.0' into qds/dev" into qds/dev 2022-11-09 15:42:39 +00:00
Tim Jenssen
f8c99ebd9a Merge remote-tracking branch 'origin/9.0' into qds/dev
Change-Id: I02fd6f492c27d85b88af7ec8bc18ff62f2c6ed14
2022-11-09 16:41:12 +01:00
Knud Dollereder
583e53cb08 QmlDesigner: Make DS find the qmlpuppet on macOS
The puppet is now build into a different directory.
This patch updates the qml2puppet search path for DS.

Change-Id: Ib522df599f429914275700813fa8d1e526b1ce4a
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-11-09 15:32:43 +00:00
Marco Bubke
63022d08ea QmlDesigner: QmlPuppet as standalone tool
The qmlpuppet is now a standalone tool. There is new a library too with
the communication code. That is shared between the designer and the
puppet. It's in a .cmake file so it can be included by the standalone
tool if it is not part of a designer build.

Task-number: QDS-5879
Change-Id: I2bc2a0b463fbb3e0c8c23d182abfd368cf87e968
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-11-09 12:29:38 +00:00
Eike Ziller
b038ea3a40 Fix debugging with LLDB
Broke with bb11788a0a

Change-Id: Ie02a36b98be83bd4721eacc834321a5494c584a3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
v9.0.0-rc1
2022-11-09 11:47:52 +00:00
The Qt Project
5434de83b9 Merge "Merge remote-tracking branch 'origin/8.0' into 9.0" into 9.0 2022-11-09 11:28:25 +00:00
Eike Ziller
872994b5e5 CMake/translations: Use lconvert for cleaning ts files
For the translation process it is nice to keep obsolete items and locations,
but we do not want these submitted in the end. So while translating we'd have
patches:

1. lupdate cleaned of obsolete and line numbers
2. wip: lupdate with obsolete and line numbers
3. translation of plugin X
4. translation of plugin Y

and before submitting we want to remove the wip patch (2).

But, running lupdate with "-no-obsolete -locations none" for cleaning
the ts file has a slightly different sorting than without it, which
leads to conflicts when removing the wip patch (2).

Instead run lupdate with obsolete items and line numbers first, and
clean the ts file with lconvert afterwards. That keeps the diff between
patch (1) and (2) minimal, and results in a clean rebase process when
removing patch (2).

Change-Id: I3b8ac7c30dc6eb0e501be765eb6e64069007a5bd
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-09 11:11:13 +00:00
hjk
c406df7470 Changes: Mention debugger performance once more
Change-Id: I0a44a4348c8f3bdac20e28cc15cff7093aef634d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-11-09 10:54:34 +00:00
hjk
19ef8e5c7a Debugger: Avoid some temporary containers when parsing escaped chars
Change-Id: Ia9af6801de6f745388e464fc806297d396c66160
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-11-09 10:54:30 +00:00
Tim Jenssen
63d3a6bd3d Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
  src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
  src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
  src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: I24216ae3f83cdde3493b4a6274e24a72f75820fc
2022-11-09 11:45:25 +01:00
Marcus Tillmanns
06838e3e5e ProjectExplorer: Fix potential race condition
When using BuildStep::runImpl() it was possible for the async part
to still be running while the BuildStep is already deleted.

This change returns the Future so that users can wait for it to finish.

Change-Id: I27c0fc8741c59851c5ab8f5cb858fbcda923c14d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-09 08:33:37 +00:00