Commit Graph

7857 Commits

Author SHA1 Message Date
Miikka Heikkinen
7c0652b7ac QmlPuppet: Small optimization to rendering 2D content in 3D scene
There is no need to read back the texture into image when rendering
2D content for embedding into 3D scene, so don't do that.

Change-Id: If84619bdc20e6997733effc4745a496fab69e5b8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-07-02 13:37:54 +00:00
Henning Gruendl
cd7c8160ea QmlDesigner: Remove obsolete QML types
Change-Id: I6623bb11d73a00b3b497e01678cdf4b82491a800
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-02 08:31:11 +00:00
Henning Gruendl
c7ad1c31bd QmlDesigner: Fix Qt6 property editor issues
* Fix hover state for disabled controls
* Fix deprecation warning about injection of parameters
* Code cleanup
* Update QtQuick import version
* Update copyright header

Task-number: QDS-4658
Task-number: QDS-4665
Change-Id: I756a0cdeb1bcdf0ea324d112fb9c5f88cadde6b3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-02 08:30:58 +00:00
Nodir Temirkhodjaev
7bb7debb5c styles/inkpot.xml: Add definition for "Parameter"
Task-number: QTCREATORBUG-25619
Change-Id: Iebf1710f3bb75e022a8267993ab8cfa37eaff847
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-07-02 05:59:59 +00:00
Miikka Heikkinen
18f24ffd68 QmlPuppet: Fix multiselection fit object in 3D editor
Multiselection is now properly fit to the view when fit object is used.

Fixes: QDS-4608
Change-Id: Ia80133fc861bd177b9102423ebef37b592c74758
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-07-01 14:29:35 +00:00
Christian Stenger
111f1465c8 Wizards: Fix QtQuick Stack wizard
Amends 1e80ed9b78.

Change-Id: I2a30c38ff84a9793452a66265b584d47938444a7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-07-01 14:08:12 +00:00
Kama Wójcik
1a5c15b3e3 QmlDesigner: Add new constant value for qtquick3d
Change-Id: I57126c7fb9a20b2970addbf55d979f1e72c6e533
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-30 16:27:38 +00:00
Henning Gruendl
459b67a77d QmlDesigner: UX improvement in property editor
Disable certain geometry property controls (x, y, width, height) in
the property editor when an item is controlled by a layout or anchors.

Task-number: QDS-3209
Change-Id: Ib8e5dba17c57d67464052321e0323c9fc21539a5
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-29 15:12:32 +00:00
Miikka Heikkinen
64d274454e QmlPuppet: Fix imported 3D asset library icon generation
Recent changes to custom geometry handling now require that the
zoom process in icon creation does each focus step asynchronously,
so that selection box geometry has a chance to update between frames.

Fixes: QDS-4652
Change-Id: If92bf580a556a68c10d3af1406c2eabef530254a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-06-29 14:28:24 +00:00
Miikka Heikkinen
b058b6e841 QmlPuppet: Add separate set of qml files for Qt6 for 3D editor
Import QtQuick3D 1.15 no longer works in Qt 6.2, so provide a separate
set of qml files for each major Qt version.

Fixes: QDS-4642
Change-Id: I3e17fb248f71f87fb9a40dcad3c03e037cafb0f4
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-29 12:03:57 +00:00
Miikka Heikkinen
48348b8dc4 QmlPuppet: Change custom 3D geometries to use public API
Custom geometries often break and code becomes convoluted with
version ifdeffing, so refactor the custom geometries to use public
geometry api, which works both in Qt5 and Qt6.

Fixes: QDS-4611
Change-Id: I2d78776a14d5c8153b52806842254dbedb5de83d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-06-29 12:03:51 +00:00
Miikka Heikkinen
a86c480d50 QmlDesigner: Fix warnings about using anchors for layouted items
Using anchors for layouted items is undefined behavior, so fix those
instances in GradientPresetList. These also caused crash at design
mode open when building against Qt 6.2.

Fixes: QDS-4647
Change-Id: I801ce4c98c6cda74be522c73c4e1eb5bef7c7e1b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-06-29 12:03:45 +00:00
Miina Puuronen
d5182a890a QmlDesigner: Disable Asset Library context menu when not needed
Assets Library context menus options are now enabled only when needed
and disabled otherwise. Also some renaming etc.

Task-number: QDS-4628
Change-Id: I5b2c4209f8389e51cf3f5e470bc14e5f9ffc1f29
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-06-29 10:13:37 +00:00
Mahmoud Badri
5470385085 QmlDesigner: clear assets selection on focus out
Fixes: QDS-4625
Change-Id: I4a9ab829522d66e3644bba7d43845bbe82d0773b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-06-29 09:08:00 +00:00
Henning Gruendl
3ac25411b4 QmlDesigner: Update layout specifics
* Update GridLayoutSpecifics
* Add missing Row-, Column- and StackLayoutSpecifics

Task-number: QDS-4648
Change-Id: I8d9c48ea7cfa4a33a84a9f2c039cca0c0b10f62b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-29 08:29:42 +00:00
Henning Gruendl
5f8e344a7d QmlDesigner: Update alias icon in navigator
* Replace the aliasOn/Off icon in the navigator with alias icon
* Change color for alias icon in Property Editor so it will match with
  the navigator

Task-number: QDS-4646
Change-Id: Idda5e62dac527c645c7c7b9de9c8b448087f31a7
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-29 08:29:21 +00:00
Kama Wójcik
45b41a04c3 QmlDesigner: Fix layout and tooltip
* Fix layout for AnimatedImage
* Fix tooltip for Animation section

Change-Id: Ibdcc2e34317555396ad51fbf873dfcee1adbcf55
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-28 14:56:37 +00:00
Kama Wójcik
d0f8fdff0d QmlDesigner: Fix layout and tooltip
* Fix layout for AnimatedImage
* Fix tooltip for Animation section

Change-Id: Ibdcc2e34317555396ad51fbf873dfcee1adbcf55
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-28 14:30:20 +00:00
Miina Puuronen
a813897825 QmlDesigner: Disable Asset Library context menu when not needed
Assets Library context menus options are now enabled only when needed
and disabled otherwise. Also some renaming etc.

Task-number: QDS-4628
Change-Id: I5b2c4209f8389e51cf3f5e470bc14e5f9ffc1f29
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-06-28 12:30:17 +00:00
Eike Ziller
a9cdf04cb4 Merge remote-tracking branch 'origin/5.0'
Change-Id: Ifc49d21fa35373e036ea547ddd1dbdc0510da7bd
2021-06-28 09:01:36 +02:00
Henning Gruendl
a842409d2c QmlDesigner: Fix minor property editor issues
* Fix infinity indicator in AnimationSection
* Fix property label capitalization and spelling
* Update import version and license header

Change-Id: If0eb6a0c00f17bbe1dcdacae73dca7be5e6faf8d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-25 15:18:10 +00:00
hjk
1fef4085bf Debugger: Support CLion based LLDB
Change-Id: Ie044def8c243a62734cc77a9eab29cbb1fa81e66
Done-by: Igor Lifanov
Task-number: QTCREATORBUG-14539
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-25 06:13:03 +00:00
Henning Gruendl
9895cd5df8 QmlDesigner: Fix minor property editor issues
* Remove minorQtQuickVersion
* Add missing PageIndicatorSpecifics.qml
* Fix label text in RectangleSpecifics

Change-Id: I3dc49c893a204416b742ae603ce2834b061db4d6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-24 16:09:31 +00:00
Henning Gruendl
d5544c7aba QmlDesigner: Fix a few warnings and errors
Change-Id: Ie25fdc100a8288cd1b10ee186ab925c0ed13ee2d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-24 16:08:45 +00:00
Henning Gruendl
18f9a69f29 QmlDesigner: Remove QtGraphicalEffects from ColorEditor
Change-Id: I96772ddc67314d657c27e4d89f337b9c19c9684f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-24 16:07:36 +00:00
Mahmoud Badri
e8a3a6aad3 QmlDesigner: clear assets selection on focus out
Fixes: QDS-4625
Change-Id: I4a9ab829522d66e3644bba7d43845bbe82d0773b
Reviewed-by: Miina Puuronen <miina.puuronen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-06-24 08:11:23 +00:00
hjk
55f3d566a0 Debugger: Use more sensible import defaults for personaltypes.py
Fixes: QTCREATORBUG-25898
Change-Id: I6fbaaf0c219299ff157446376959e305693a9902
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-23 09:52:17 +00:00
Miikka Heikkinen
1c44dab5af QmlPuppet: Render 2D content inside 3D edit view
In order to render embedded 2D items in 3D scenes or 2D items used
as 3D material textures, those 2D items must be rendered.
2D content is now rendered when necessary also in editor puppet.

Fixes: QDS-4471
Change-Id: I83da90198ecebc3a3a9a35aab28f4aec36620492
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-06-23 08:44:47 +00:00
Henning Gruendl
66cd1a41c9 QmlDesigner: PropertyEditor redesign
* Add responsive resizing for property editor width
* Adapt custom component templates
* Fix custom component template generation if no properties defined
* Adapt Animation specifics and sections
* Adapt HelperWidgets specifics and sections
* Update ColorEditor and its components
* Remove SimpleColorPalette and its components
* Add ColorPaletteSingleton
* Implement eye dropper for ColorEditor
* Add TextExtrasSection and FontExtrasSection
* Move Component section to a new file
* Remove Advanced tab make its content a section
* Redesign TabBar and TabButton
* Make QtQuick.Controls 2 specifics part of QtCreator repository for now
* Update import versions
* Add new constants
* Update icon font
* Fix/update StudioControls and HelperWidgets
* Fix a few undefined warnings

Task-number: QDS-4582
Task-number: QDS-4562
Task-number: QDS-4555
Task-number: QDS-4554
Task-number: QDS-4553
Task-number: QDS-4299
Task-number: QDS-4296
Task-number: QDS-3769
Change-Id: Ia9677fd97f26e0e31a45da7a4136db1c9e1a5bf2
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2021-06-22 14:08:30 +00:00
Miikka Heikkinen
193f485be2 QmlDesigner: Fix unused variable warnings
Change-Id: I1616452753685bbd57eec8fc6e1c9934c63fef0c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-06-22 08:54:41 +00:00
Assam Boudjelthia
7722ec5f0d Fix CMake templates information for Android
The CMake templates still point to information that apply only to Qt 5
when it comes to settings Android properties. This updates the template
to show the right way to define Android target properties on Qt 6 as
well.

Task-number: QTBUG-94597
Change-Id: I28e3dbd93eca352502b3d1b584f02924e2478c07
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-06-22 08:25:12 +00:00
Mahmoud Badri
3188c448b6 QmlDesigner: Suppress some warnings from the assets library
Change-Id: Idd192ce20e610a1689cfc9b0a11215dd16f09911
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-06-18 13:42:15 +00:00
Mahmoud Badri
5369aea1ed QmlDesigner: Implement multi-selection in the asset library
Multi-selected assets can be dragged to the form editor
and navigator. Also increased font size for newly
created text as it was so small and some relvant
cleanups.

Change-Id: Icf28b627a8392309520b7071209812e1ae051e84
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-17 12:21:16 +00:00
Miina Puuronen
c5056eed23 QmlDesigner: Context menu for Assets Library
Added context menu for Assets Library. Assets directories can now be
expanded or collapsed. Rootpath is skipped to make sure subdirectories
headers stay visible.

Task-number: QDS-4488
Change-Id: I5377ba9e9837bae6fad1571780a16b65ed6eefff
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-17 08:02:30 +00:00
Eike Ziller
905f5d4e1b Merge remote-tracking branch 'origin/4.15'
Conflicts:
	coin/instructions/common_environment.yaml

Change-Id: I2084c24f7e052b9647b30f810207b3c8beecce3c
2021-06-16 11:48:08 +02:00
Mitch Curtis
1ef0eba378 Fix Q_PROPERTY warning
Explicitly cast to bool since that seems to be the intention.

Fixes: QTBUG-90607
Change-Id: Ic7debcc6af4415af6288aa1739bd602dbca0e251
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-06-14 13:41:09 +00:00
The Qt Project
ed426f041d Merge "Merge remote-tracking branch 'origin/4.15'" 2021-06-11 13:50:50 +00:00
Miikka Heikkinen
acb4113f09 QmlPuppet: Enable negative scaling in multiselection
Scenerotation was queried from the node for each drag move, causing
drift in the calculations. Locking the rotation at drag start makes
negative scaling work nicely.

Also enabled negative values on all axis scaling, since it makes no
sense to block it there when single axis/planar scaling already allows
it.

Fixes: QDS-4493
Change-Id: I7a38a08556bd6d729974332d312aa4aa4e84ea30
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-11 12:28:38 +00:00
Miikka Heikkinen
b73884bee5 QmlPuppet: Fix runtime warnings in 3D editor
Fixes: QDS-4491
Change-Id: I462e165ef59111f70c928b7d652ade99c5b3c0d0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-06-11 12:28:26 +00:00
Eike Ziller
2f7f645983 Merge remote-tracking branch 'origin/4.15'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ibd07b5b5ff7c3282134b062ed28b1c4951061c97
2021-06-11 14:20:21 +02:00
Thomas Hartmann
b1926e41c5 QmlDesigner: Update default image for Image
Change-Id: I83f795ee5cb6c9ecfbf06c50d5d2ab5ade4fbabc
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-11 12:09:11 +00:00
Thomas Hartmann
1f2add35ba Add Timeline to qt5QtQuick2-bundle
Change-Id: I7df459925201ecbe8e9be4b92b63c6b5bcd50b39
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-06-11 08:05:03 +00:00
Miikka Heikkinen
74f65abed0 QmlPuppet: Fix multiselection 3D transformations when nodes have pivot
We simply need to store the scene position of the pivot point of the
node instead of node itself and work with that.

Fixes: QDS-4515
Change-Id: I99155636c52897794bea21b2db7f7d2d00059d91
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-11 07:47:19 +00:00
Miikka Heikkinen
4e1ca8d3c5 QmlPuppet: Reset gizmo orientation after multiselection rotation
Gizmo orientation in multiselection case should always be aligned to
the global axes, so we now reset multiselection on release
handlers of rotation gizmo.

Fixes: QDS-4492
Change-Id: Ic10f26f65df42869e4643f48457bcbcbf970fe9a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-11 07:47:13 +00:00
hjk
84b8930c27 Debugger: Display elision for long Utils::FilePath instances
Change-Id: Ifb89ad1af1a41dff87d9debbb72423288c59d632
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-09 12:00:05 +00:00
Thomas Hartmann
306904fe83 QmlDesigner: Use Window instead of Dialog
Change-Id: I9f7392788e96ed399f686caed41e30e8347b3665
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-07 07:06:44 +00:00
Alessandro Portale
dcbf26490d QmlPuppet: Fix build with Qt 6.2
Fixes: QTCREATORBUG-25763
Change-Id: I05f4b44a3793c41fd1c6812f40f6603892cdac50
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-06-04 10:12:30 +00:00
Mahmoud Badri
c47f173ba9 QmlDesigner: Fix asset drag issue
Workaround QDrag issue that causes drag to stay active after pressing
and releasing at the same point.

Fixes: QDS-4446
Change-Id: Ieb25656a1e9f42c724a254820c1d290a522835d5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-06-04 08:50:49 +00:00
Thomas Hartmann
8910601b78 QmlDesigner: Allow creation without version number
Task-number: QDS-4403
Change-Id: I952de9a2a6aa345b041f890fb2d364850c25e492
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-06-01 10:44:18 +00:00
Miikka Heikkinen
f913a65405 QmlPuppet: Support multiselection transformations in 3D edit view
Add support for moving, rotating, and scaling a multiselection of 3D
nodes in 3D edit view.

Fixes: QDS-4313
Change-Id: Icf83911ac6f87fde1cb79d6f5059ae01ed434d7f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-01 09:38:00 +00:00