Tim Jenssen 80e2eddd95 Merge remote-tracking branch 'origin/8.0' ...

resolved conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/designercore/exceptions/exception.cpp

Change-Id: I13a5248415fa1ae03e1c6d0972d9b3bb8c80a3b0

2022-09-22 10:32:40 +02:00

..

commands

QmlDesigner: Break dependency to View3DActionCommand

2022-09-15 09:20:12 +00:00

container

Use SPDX license identifiers

2022-08-26 12:27:18 +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

Use SPDX license identifiers

2022-08-26 12:27:18 +00:00

interfaces

QmlDesigner: Break dependency to View3DActionCommand

2022-09-15 09:20:12 +00:00

mockfiles

Merge remote-tracking branch 'origin/8.0'

2022-09-13 11:15:16 +02:00

qml2puppet

Merge remote-tracking branch 'origin/8.0'

2022-09-22 10:32:40 +02:00

qmlprivategate

Use SPDX license identifiers

2022-08-26 12:27:18 +00:00

types

Use SPDX license identifiers

2022-08-26 12:27:18 +00:00

editor3d_qt5.qrc

QmlDesigner: Add environment and model selectors to material preview

2022-08-11 13:33:59 +00:00

editor3d_qt6.qrc

QmlDesigner: Add environment and model selectors to material preview

2022-08-11 13:33:59 +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