Eike Ziller 164aae53d2 Merge remote-tracking branch 'origin/6.0' ...

Conflicts:
	src/libs/utils/theme/theme_mac.mm
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/debugger/lldb/lldbengine.cpp

Change-Id: I5f2c62e0bce6c91a53a554b3278dbe23ff7dde36

2021-11-11 13:04:42 +01:00

..

commands

Add particle editor support

2021-11-05 11:31:31 +00:00

container

Get rid of deprecation warning when compiling against Qt 5.15

2020-11-17 11:39:56 +00:00

html

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

images

QmlDesigner: Update default image for Image

2021-06-11 12:09:11 +00:00

instances

QmlDesigner: Add navigator preview tooltip for materials

2020-09-16 07:00:06 +00:00

interfaces

QmlDesigner: Add image cache

2020-10-16 10:01:21 +00:00

mockfiles

Use global picking API

2021-10-14 04:08:33 +00:00

qml2puppet

Merge remote-tracking branch 'origin/6.0'

2021-11-11 13:04:42 +01:00

qmlprivategate

Add particle editor support

2021-11-05 11:31:31 +00:00

types

QmlDesigner: reduce enumeration to header only

2019-08-07 14:48:04 +00:00

editor3d_qt5.qrc

QmlPuppet: Add separate set of qml files for Qt6 for 3D editor

2021-06-29 12:03:57 +00:00

editor3d_qt6.qrc

Add 3D editor Gizmo for Quick3DParticles

2021-08-13 11:23:19 +00:00

qmlpuppet_utilities.pri

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

qmlpuppet.qrc

QmlPuppet: Add separate set of qml files for Qt6 for 3D editor

2021-06-29 12:03:57 +00:00