Eike Ziller 8245523653 Merge remote-tracking branch 'origin/4.14' ...

Conflicts:
	src/plugins/designer/cpp/formclasswizard.h
	src/plugins/designer/cpp/formclasswizarddialog.h

Change-Id: I9f9d166e1a9249022305503f9cbe571136c2a2b1

2020-11-25 11:25:34 +01:00

..

commands

MultiLanguage: Add image generation for excel export

2020-11-19 13:22:44 +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

QmlPuppet: Remove effect preview support

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

qml2puppet

Merge remote-tracking branch 'origin/4.14'

2020-11-25 11:25:34 +01:00

qmlprivategate

Add missing "final" to unexported/unshared classes

2020-11-18 15:40:29 +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