Eike Ziller 6fc85b49fa Merge remote-tracking branch 'origin/4.11' ...

Conflicts:
	src/plugins/designer/codemodelhelpers.cpp

Change-Id: I78906f2fbbfd27d254589a272ebca423b0b80699

2019-11-28 08:24:10 +01:00

..

commands

Merge remote-tracking branch 'origin/4.11'

2019-11-21 22:18:35 +02:00

container

QmlDesigner: Avoid reflection when setting values from puppet

2019-10-30 09:46:35 +00:00

html

QmlDesigner.NodeInstances: Move qmlpuppet to share

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

images

PNG: Run pngcrush on images with iCCP or sRGB profiles

2015-07-03 09:50:46 +00:00

instances

Implement DnD 3D objects from the item library to the EditView3D

2019-11-12 10:00:34 +00:00

interfaces

Implement DnD 3D objects from the item library to the EditView3D

2019-11-12 10:00:34 +00:00

mockfiles

Implement 3D edit view top controls UI

2019-11-26 13:42:30 +00:00

qml2puppet

Merge remote-tracking branch 'origin/4.11'

2019-11-28 08:24:10 +01:00

qmlprivategate

Some clang-tidy -use-modernize-nullptr

2019-08-01 13:20:26 +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

Implement 3D edit view top controls UI

2019-11-26 13:42:30 +00:00