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

Conflicts:
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/clangcodemodel/clangdclient.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/designercore/include/modelnode.h
	src/plugins/qmldesigner/designercore/model/modelnode.cpp
	src/plugins/qmldesigner/designercore/model/rewriterview.cpp

Change-Id: I93c57879b79f27325321bfc045ca618bd835af93

2022-08-26 08:40:23 +02:00

..

editor3d

Merge remote-tracking branch 'origin/8.0'

2022-08-05 08:50:27 +02:00

iconrenderer

qml2puppet: fix build

2022-07-12 09:58:52 +00:00

import3d

QmlPuppet: Adapt to C++ 17 [[maybe_unused]]

2022-07-11 09:29:37 +00:00

instances

Merge remote-tracking branch 'origin/8.0'

2022-08-26 08:40:23 +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

QmlDesigner: Show error message on import log for failed 3D import

2022-03-11 14:18:04 +00:00