Eike Ziller 3944162039 Merge remote-tracking branch 'origin/4.13' into master ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
	src/plugins/cmakeprojectmanager/cmakebuildstep.h
	tests/auto/debugger/tst_namedemangler.cpp
	tests/auto/qml/codemodel/check/tst_check.cpp

Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2

2020-08-10 15:56:54 +02:00

..

commands

Merge remote-tracking branch 'origin/qds-1.59' into 4.13

2020-06-26 16:51:22 +02:00

container

QmlPuppet: Fall back to pre-Qt5.2 for QVariant comparison

2020-06-26 07:11:16 +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

QmlDesigner: Increase alive timer

2020-05-26 18:14:27 +02:00

interfaces

qmldesigner: remove double command registration

2020-06-05 14:41:32 +00:00

mockfiles

QmlDesigner: Fix group selection for 3D scenes that have Models as root

2020-08-07 10:56:53 +00:00

qml2puppet

Some Qt6 compilation

2020-07-13 10:52:47 +00:00

qmlprivategate

QmlPuppet: Make compilable with Qt6

2020-08-07 07:27:20 +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

QmlDesigner: Add handles to light gizmo for adjusting area light

2020-06-09 12:12:55 +00:00