Eike Ziller 4a826ada04 Merge remote-tracking branch 'origin/4.0' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa

2016-04-22 15:13:58 +02:00

..

designercustomobjectdata.cpp

QmlPuppet: fix Qt 5.5 builds

2016-03-22 13:15:36 +00:00

designercustomobjectdata.h

Wholesale conversion to #pragma once

2016-03-30 15:20:19 +00:00

designersupportdelegate.h

Update License according to agreement with Free Qt Foundation

2016-01-19 16:05:29 +00:00

metaobject.cpp

Revert "QmlDesigner: call directly the invalidate method"

2016-01-21 12:15:08 +00:00

metaobject.h

Wholesale conversion to #pragma once

2016-03-30 15:20:19 +00:00

qmlprivategate_56.cpp

QmlPuppet: Make compile without QT_RESTRICTED_CAST_FROM_ASCII removed

2016-03-18 14:17:04 +00:00

qmlprivategate.cpp

QmlPuppet: Don't compare C string literals with ==

2016-04-21 09:50:25 +00:00

qmlprivategate.h

Wholesale conversion to #pragma once

2016-03-30 15:20:19 +00:00

qmlprivategate.pri

QmlDesigner: fix binding is not working

2016-04-06 15:18:11 +00:00