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

..

commands

QmlDesigner: Move 3D asset import to puppet

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

container

Get rid of deprecation warning when compiling against Qt 5.15

2020-11-17 11:39:56 +00:00

html

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

images

QmlDesigner: Return placeholder preview image for non-visual components

2020-10-12 07:33:56 +00:00

instances

QmlDesigner: Add navigator preview tooltip for materials

2020-09-16 07:00:06 +00:00

interfaces

QmlDesigner: Add image cache

2020-10-16 10:01:21 +00:00

mockfiles

Add optional fps counter to 3D edit view

2020-11-27 14:24:40 +00:00

qml2puppet

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

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

qmlprivategate

QmlDesigner: Fix compilation for Qt 6

2021-03-16 14:35:48 +00:00

types

QmlDesigner: reduce enumeration to header only

2019-08-07 14:48:04 +00:00

qmlpuppet_utilities.pri

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

qmlpuppet.qrc

QmlPuppet: Remove effect preview support

2020-11-17 15:49:13 +00:00