Tim Jenssen b8cd87dea0 Merge remote-tracking branch 'origin/qds-1.59' into 4.13 ...

Conflicts:
	src/plugins/clangformat/clangformatplugin.cpp
	src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
	src/plugins/qmldesigner/qmldesigner.qbs

Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a

2020-06-26 16:51:22 +02:00

..

editor3d

QmlDesigner: Restore the previously active 3D scene on scene creation

2020-06-09 12:31:57 +00:00

iconrenderer

QmlPuppet: Fix build

2020-04-27 18:47:34 +00:00

instances

Merge remote-tracking branch 'origin/qds-1.59' into 4.13

2020-06-26 16:51:22 +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: improve text

2020-06-16 14:34:59 +00:00

qml2puppet.pro

QmlDesigner: On demand compilation of the puppet

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

qml2puppetmain.cpp

QmlDesigner: Create thumbnail for imported 3D assets

2020-03-30 07:59:03 +00:00