Eike Ziller 2f7f645983 Merge remote-tracking branch 'origin/4.15' ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ibd07b5b5ff7c3282134b062ed28b1c4951061c97

2021-06-11 14:20:21 +02: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: Update default image for Image

2021-06-11 12:09:11 +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: Reset gizmo orientation after multiselection rotation

2021-06-11 07:47:13 +00:00

qml2puppet

QmlPuppet: Fix multiselection 3D transformations when nodes have pivot

2021-06-11 07:47:19 +00:00

qmlprivategate

QmlDesigner: Allow creation without version number

2021-06-01 10:44:18 +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