Eike Ziller 68c5968447 Merge remote-tracking branch 'origin/7.0' into 8.0 ...

Conflicts:
	src/libs/utils/launchersocket.cpp

Change-Id: I7ec649485bb7fc7c299b571d92519d2b7fc9506b

2022-06-02 10:54:10 +02:00

..

editor3d

QmlDesigner: Handle picking of models under View3D component properly

2022-05-31 12:02:49 +00:00

iconrenderer

QmlPuppet: Fix imported 3D asset library icon generation

2021-06-29 14:28:24 +00:00

import3d

QmlDesigner: Remove hardcoded timeout from 3D import puppet

2022-05-30 14:16:27 +00:00

instances

Merge remote-tracking branch 'origin/7.0' into 8.0

2022-06-02 10:54:10 +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