Commit Graph

74649 Commits

Author SHA1 Message Date
Christian Stenger
57c5dfa840 QmlDesigner: Fix qbs build
Change-Id: I9a84c9c3babe606f5ac1b0bf19cc05084822ad35
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-15 14:01:06 +00:00
Thomas Hartmann
620712ed66 QmlDesigner: Take StageGroup into account in allDefinedStates
Since we add support StateGroups we also have to take them here.

Change-Id: I54a897e6edc4677e90ea64dd5c7334fc76a8f36f
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-15 12:53:57 +00:00
Christian Kandeler
ec1905c6fa CppEditor: Use "-I<dir>" format rather than "-I <dir>"
... when constructing the compiler command line.
This works around a command line parsing bug in clangd 15.0.0
(https://github.com/clangd/clangd/issues/1292).

Change-Id: I7c2e7f443bfededf12db985ff5142f39035d9db6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-15 12:36:54 +00:00
Thomas Hartmann
4bf105b662 QmlDesigner: Ignore "when" property for all states
We actually did set the "when" property for StateGroups.

Change-Id: I45a1663d60f8f443b4deafa529d1fd2788a8459e
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-15 10:51:05 +00:00
Thomas Hartmann
3ce5af7a79 QmlDesigner: Remove dangling PropertyChanges and KeyFrameGroups
This removes dangling PropertyChanges and KeyFrameGroups when removing
a dynamic property.

Change-Id: I333b6a61bec34a0bcde1d19372166b3cfaea195b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-15 10:38:40 +00:00
Thomas Hartmann
696b02ee28 QmlDesigner: Add convertToLiteral to BindingProperty
This helper function returns a valid QVariant if
the expression is actually a literal.

Change-Id: I756b22d66ad86294c475e92c129f9008315dfbc6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-15 10:38:21 +00:00
Thomas Hartmann
26a2afea01 QmlDesigner: Sort dynamic properties by name
Change-Id: I303904872982c0464f1853320f6b47f68c9181de
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-15 09:42:51 +00:00
Thomas Hartmann
ff95787887 QmlDesigner: Use "This is a string" as default for string
Change-Id: I3d4d6e3dc32e5589e519fdadab0ae0996f7ae21e
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-15 09:42:38 +00:00
Christian Stenger
6ae6390661 AutoTest: Fix gtest filter usage
There are shells that need the filter to be quoted to avoid
shell globbing.

Fixes: QTCREATORBUG-28153
Change-Id: I13eb5cb362b3543f5a88b27fb170c579ae6dde4b
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-15 07:51:29 +00:00
Thomas Hartmann
1fe4db0231 QmlDesigner: Add removeKeyframesForTargetAndProperty
This allows to remove keyframe groups for a specific property.
This is required if a dynamic property is removed.

Change-Id: Ic3a2609241df21d81954ab18e4aeec1c47bfe336
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-15 06:35:21 +00:00
Thomas Hartmann
1d46fee51f QmlDesigner: Add allTimelines
This makes it easy to retrieve all existing timelines.

Change-Id: I61fdacce28ea7c8afe48da81b87c8b47ee1cec26
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-15 06:35:00 +00:00
Marcus Tillmanns
ed46f1f002 linuxdevice: Fix ::bytesAvailable
DeviceShell does not support piping commands at the moment.

To continue to support ::bytesAvailable the parsing of the
output from "df" is moved to FileUtils::bytesAvailableFromDFOutput.

Change-Id: Ia229208748aa6c572b99899e6ae042bdd5654f4a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-09-15 05:21:52 +00:00
Thomas Hartmann
704fb9c0e6 QmlDesigner: Add deferred loading to dialog in ColorEditor
If the gradient editing is disabled we can load the
dialog when it is opened and not before.
If there is a gradient then the dialog is still to tightly coupled
with the ColorEditor.

Change-Id: Ie01b5fc5f94b4cb0969778e87d7fb0e1273b5d57
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-09-14 14:19:58 +00:00
Henning Gruendl
eeeea090cc QmllDesigner: Fix dynamic properties layout
* Fix layout
* Add missing qsTr()
* Remove unnecessary alignment settings

Change-Id: Ie8d90e61d39933e573cb119e5ed3a15fcbca9674
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-14 13:15:17 +00:00
Jarek Kobus
1b412a97ae testFileTransfer(): Cleanup remote after successful transfer
Change-Id: I770149f69a7ff4c897ad495794b60accddbd67e9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-14 11:09:08 +00:00
Jarek Kobus
0b90c6c6f6 SftpFileTransfer: Don't use temporary file for batch file
Use a "-" for a batch file option "-b" what makes sftp
read batch from standard input.

Fixes: QTCREATORBUG-28167
Change-Id: I449c5ba97ea11fca090b748f0a5ee8099140a548
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-14 11:08:59 +00:00
Jarek Kobus
f9522051f7 testFileTransfer(): Add more checks
Make the target path more nested.

Task-number: QTCREATORBUG-28151
Change-Id: Iae0660294d873e82e3fef0cbf2411f7c22ef526f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-13 15:31:25 +00:00
Miikka Heikkinen
e15d834601 QmlDesigner: Create 3D models at the point of context menu trigger
Fixes: QDS-7640
Change-Id: I2f178c2e2661dedc4efe23b675363283e3cd3bc3
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-13 10:15:34 +00:00
Henning Gruendl
fbb9dd1647 QmlDesigner: Allow multiple StateGroups in .ui.qml
Change-Id: If7f626f196899ebd49e5f6393d8e3ef81447945c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-13 10:05:23 +00:00
Henning Gruendl
3256888294 QmlDesigner: Fix MenuSeparator not displayed
StudioControls.MenuSeparator isn't displayed as setting width/height
is wrong. Instead use the implicit version of the properties.

Change-Id: I44a269e10b1ef6507009ecffb6b8e90736d24f45
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-13 10:05:17 +00:00
Antti Määttä
1b688b51fd Optimize TimelineModelPrivate::incrementStartIndices
Reduces the overhead of the function by a factor of ~500(depending on
the event count) by having the Range(start) index to the RangeEnd so
that we can only increment the RangeEnds that actually
need to be incremented.

Fixes: QTCREATORBUG-28162
Change-Id: I9daa711d0a1d960b232c5ed30564271daa68d1aa
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-13 09:00:53 +00:00
Knud Dollereder
67408ac183 Add tooltips to the timeline settings dialog
Using the suggestions from the bugreport.

Fixes: QDS-7109
Change-Id: Iedf991958525d793f89e3d591f978a19d53a39bd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-13 06:56:31 +00:00
Miikka Heikkinen
a2c8972ce1 QmlDesigner: Expose dynamic texture and vector properties in components
Provide editor templates for Texture, TextureInput, and vectorXd
type dynamic properties exposed by components.

Change-Id: Ie7ae62aeffc5e151a1300b3aefdfc68584ccda6a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-12 13:57:25 +00:00
Thomas Hartmann
c1bc770564 QmlDesigner: Reset dynamicPropertiesModel on state change
Change-Id: If503d0d4f5cb3d23c4445fa6e774729779d4dd5b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-12 13:30:45 +00:00
Eike Ziller
c9e0d08571 COIN/GitHub: Use Qt 6.3.2
Change-Id: If49d111eec5cd4b4a229c3f21ff282733dd3fbb2
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-12 11:59:17 +00:00
Jarek Kobus
1df6806e0b GenericDirectUploadService: Check exitCode when handling failure
Task-number: QTCREATORBUG-28151
Change-Id: Ib61959ce792208edb1acb5cf1131e34c248cd795
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-12 11:51:44 +00:00
David Schulz
57f80dc813 Downgrade Source Code Pro font
The old version looks crisper. Downgrade to
Roman fonts version 2.030 and Italic fonts version 1.050

Fixes: QTCREATORBUG-28106
Fixes: QTCREATORBUG-28139
Change-Id: Iec077fddf2ddba71b8b2cd7de92f397e12b6dc65
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-12 10:17:09 +00:00
Knud Dollereder
b3359f28a6 Use Mouse wheel and ctrl to zoom the curve editor
Change-Id: I85001a2173e69887f72c2e0b366861e0753dd8a3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-12 08:24:25 +00:00
Thomas Hartmann
0192cef3bb QmlDesigner: Make DynamicPropertyRow::commitValue state aware
Change-Id: I2f6d93be6fe1f92637902138ac9f073f18f1af22
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-12 06:51:38 +00:00
Thomas Hartmann
af0728e530 QmlDesigner: Add early return for invalid row
Also avoiding reflection by locking during the write to the model.

Change-Id: I290ae8fa38aae510454d3fa1af020d579881ff9c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-12 06:51:23 +00:00
Mahmoud Badri
f5b3b5c88e QmlDesigner: Remove empty model from 3D Editor's create sub-menu
Change-Id: Icd6fc773d3f45459e9169406c376a5c47cf41e06
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-09 17:49:45 +00:00
Thomas Hartmann
5f3ef5f991 QmlDesigner: Fix QmlObjectNode::generateTranslatableText
This fixes the case for qsTranslate. A context has to be provided.

Change-Id: I96004f13c84e2269b4226d6c184c7874d74955b0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2022-09-09 14:15:41 +00:00
Thomas Hartmann
d24a09a6be QmlDesigner: Add static helper function for translations
Adds:

  stripedTranslatableTextFunction()
  convertToCorrectTranslatableFunction()

Change-Id: I9f8b50924c4c99cda43d32c03080bab83cfaff44
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2022-09-09 14:15:31 +00:00
Thomas Hartmann
9aa5a4cc6c QmlDesigner: Convert translation functions
This converts the translation functions when dragging in items
from the library.

Task-number: QDS-7598
Change-Id: Iaed0f6683c2083e1d103ddfc07fe7ba2a2e9224c
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2022-09-09 14:15:19 +00:00
Mats Honkamaa
e9bea54139 Doc: Add info about 3D view background color actions
Document the new options in the toolbar.

Task-number: QDS-7498
Change-Id: I7a6ec6d0a56453240e51fd4149ecc2712e7980b6
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-09-09 12:20:04 +00:00
Jarek Kobus
fa9008c7f8 VcsOutputWindow: Don't append \n when line ends with \r
Amends a2797ec80e

Fixes: QTCREATORBUG-27615
Change-Id: I5b2d2bc442696a1560a2af3dfe14e70a9c42cc88
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-09 11:29:49 +00:00
Thomas Hartmann
181f9f276c QmlDesigner: Propose Item as property type
Change-Id: Ib0a0cfd0594993e3050b7af38d6ef549b1780b44
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-09 09:23:39 +00:00
Thomas Hartmann
45fb37abe7 QmlDesigner: Use null instead of 0 for Item
Change-Id: Ifd6f06642308a981f7c50604ac1f1db56eabc261
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-09 09:23:26 +00:00
Thomas Hartmann
744c983578 QmlDesigner: Add images from asset_imports to project
This is required for the cmakefiles.txt generation.

Change-Id: Ic180b06cd2817e32625d7330edb171e223065fae
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-08 12:56:25 +00:00
Miikka Heikkinen
14fa322019 QmlDesigner: Add bundle importer
Bundle importer can be used for importing QML components from a
bundle that contains various components.

Task-number: QDS-7499
Change-Id: Ic8a122215a52912c993fba62a3bbc7cc068619db
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-08 11:45:04 +00:00
Thomas Hartmann
3478fe12e7 QmlDesigner: Bump version number in wizard
Change-Id: Icfe74081a22b81568dbbbbe210a7fc78df0ccf00
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-09-08 10:43:18 +00:00
Miikka Heikkinen
3485d97755 QmlDesigner: Add support any pickable node with 3d view context menu
Previously only 3D models could be picked for context menu target.
Now any node that can be resolved from a point at 3D edit view can be
picked.

Fixes: QDS-7518
Change-Id: Id4a30d96744c42907d45688493776bdff35b934e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-08 10:36:11 +00:00
Miikka Heikkinen
a9576256b8 QmlDesigner: Fix crashes if selected node is invalidated
Change-Id: Ie85e9b023bca0dccd9c032e0d32e1462d0e77857
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-08 07:51:27 +00:00
Miikka Heikkinen
c714e5ba81 QmlDesigner: Make SHOW_DEBUG_SETTINGS setting actually work
The current value from the .ini file for this setting was never read.

Change-Id: I5b86fa04c117eb38cd5a7ef282861718c328c34e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-08 07:50:55 +00:00
Mahmoud Badri
7413e85b7c QmlDesigner: Move MaterialEditorView::generateIdFromName() to the model
Change-Id: I78aa373f7b8d70d5494866b2e2855435c9e04b04
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-06 14:04:39 +00:00
Thomas Hartmann
4c91ed496a QmlDesigner: Add dynamic properties to property editor
Added dynamic properties section to property editor and material
editor for all nodes. It shows all dynamic properties defined
for the node with proper editors for the supported types.
Dynamic properties can be added and removed via property editor
as well.
Material editor shows dynamic properties similarly.

Fixes: QDS-7411
Change-Id: Id195f5ca23d55544cea29eb8996690a7eed1cc57
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-06 12:40:50 +00:00
Miikka Heikkinen
242de4d3fb QmlDesigner: Fix crash on removing import
If material shown in material editor is provided by the removed import,
the selected node in material view becomes invalid.

Change-Id: I374e80288b5fe59d4eba63b6712d4c8891fd11cc
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-06 07:51:13 +00:00
David Schulz
9456052207 Editor: do not replace selection in drop editor
Only remove the selected text if the drag source is the editor and we
want to move the selection.

Fixes: QTCREATORBUG-28126
Change-Id: Iaa54d54c432df2da99e30ddb569e06e3ccd0df00
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-05 13:04:45 +00:00
David Schulz
c58f41face Editor: accept drop actions
In order to remove the selected text of another editor widget when
dragging text from one editor to another the drop event needs to be
accepted.

Fixes: QTCREATORBUG-28125
Change-Id: I8333fe096baf589e5669fc43370fc3519c72bb2d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-05 13:04:26 +00:00
Eike Ziller
d3a245574e Qt Examples: Fix that supported device information was not updated
When the user selects a different example set / Qt version from the drop
down, we must in all cases update the cached "supported device type",
which is later used to e.g. filter out all non-Android examples when
selecting an Android Qt version. We only did that in case the selected
example set was backed internally by a QtVersion pointer, but there are
example sets where that isn't the case.

The issue is reproducible by e.g. installing Qt 5.15 for Android and Qt
6.3 for multiple platforms. For the latter we only show a single entry
in the drop down, and do not have a single QtVersion pointer as a
backing. When switching the drop down from Qt 5.15 Android to Qt 6.3,
only examples with the "android" tag are shown, even though our Qt 6.3
installation supports more than that.

If we don't have a QtVersion pointer we now assume that everything is
supported.

Fixes: QTCREATORBUG-27017
Change-Id: I7a7666c3cfec098d85cfcbb0062c63395af6d0c0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-02 12:22:50 +00:00