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

..

editor3d

Merge remote-tracking branch 'origin/8.0'

2022-09-19 09:54:06 +02:00

iconrenderer

Use SPDX license identifiers

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

import3d

Use SPDX license identifiers

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

instances

Merge remote-tracking branch 'origin/8.0'

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

Info.plist

QmlDesigner: Do not allow keyboard focus on macOS for puppet

2020-03-26 08:27:07 +00:00

qml2puppet.pri

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

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

qml2puppet.pro

QmlDesigner: On demand compilation of the puppet

2014-04-09 16:01:05 +02:00

qml2puppetmain.cpp

Use SPDX license identifiers

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