Eike Ziller a2f21d40f5 Merge remote-tracking branch 'origin/8.0' ...

Conflicts:
	src/plugins/debugger/debuggerdialogs.cpp
	src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
	src/plugins/texteditor/fontsettingspage.cpp

Change-Id: I5a6accd2065e0d8320045b57ade7b54a9a09aae0

2022-08-31 11:03:13 +02:00

..

editor3d

Use SPDX license identifiers

2022-08-26 12:27:18 +00: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-08-31 11:03:13 +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