Marco Bubke f0a86d4510 Revert "Merge remote-tracking branch 'origin/4.15'" ...

This reverts commit 888ca0dd20.

Reason for revert: wrong patchset

Change-Id: I1291789938601aaf606c59917ff938e3c24c78dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

2021-05-06 15:30:02 +00:00

..

editor3d

QmlPuppet: Fix custom 3D geometries for Qt 6.1

2021-02-05 15:03:47 +00:00

iconrenderer

QmlPuppet: Hide 3D edit view render window

2020-11-27 12:11:28 +00:00

import3d

QmlDesigner: Fix compile error

2021-02-05 11:54:41 +00:00

instances

QmlPuppet: Re-enable navigator preview image generation

2021-05-04 14:02:50 +00:00

Info.plist

QmlDesigner: Do not allow keyboard focus on macOS for puppet

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

qml2puppet.pri

QmlDesigner: Move 3D asset import to puppet

2021-02-05 09:34:04 +00:00

qml2puppet.pro

QmlDesigner: On demand compilation of the puppet

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

qml2puppetmain.cpp

Revert "Merge remote-tracking branch 'origin/4.15'"

2021-05-06 15:30:02 +00:00