Eike Ziller 428fcb476b Merge remote-tracking branch 'origin/4.6' ...

Conflicts:
	src/libs/utils/settingsaccessor.cpp
	src/plugins/autotest/autotestplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.h

Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f

2018-04-13 10:54:42 +02:00

..

anchorchangesnodeinstance.cpp

Update License according to agreement with Free Qt Foundation

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

anchorchangesnodeinstance.h

Wholesale conversion to #pragma once

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

behaviornodeinstance.cpp

QmlDesigner: use initializer lists

2016-06-22 13:16:33 +00:00

behaviornodeinstance.h

Wholesale conversion to #pragma once

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

childrenchangeeventfilter.cpp

Update License according to agreement with Free Qt Foundation

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

childrenchangeeventfilter.h

Wholesale conversion to #pragma once

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

componentnodeinstance.cpp

Update License according to agreement with Free Qt Foundation

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

componentnodeinstance.h

Wholesale conversion to #pragma once

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

dummycontextobject.cpp

QmlDesigner: Add flag to check for designer

2017-05-04 12:34:32 +00:00

dummycontextobject.h

QmlDesigner: Add flag to check for designer

2017-05-04 12:34:32 +00:00

dummynodeinstance.cpp

Update License according to agreement with Free Qt Foundation

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

dummynodeinstance.h

Wholesale conversion to #pragma once

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

instances.pri

QmlPuppet: Bring back simplified NodeInstanceSignalSpy

2015-05-21 07:39:25 +00:00

layoutnodeinstance.cpp

Qmlpuppet: add missing includes

2017-07-10 08:48:46 +00:00

layoutnodeinstance.h

Wholesale conversion to #pragma once

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

nodeinstanceserver.cpp

QmlPuppet: Modernize (nullptr and member initialization)

2017-09-20 12:40:18 +00:00

nodeinstanceserver.h

QmlPuppet: Modernize (nullptr and member initialization)

2017-09-20 12:40:18 +00:00

nodeinstancesignalspy.cpp

Update License according to agreement with Free Qt Foundation

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

nodeinstancesignalspy.h

Wholesale conversion to #pragma once

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

objectnodeinstance.cpp

QmlDesigner: Add meta hint if item renders children directly

2018-03-09 15:05:22 +00:00

objectnodeinstance.h

QmlDesigner: Add meta hint if item renders children directly

2018-03-09 15:05:22 +00:00

positionernodeinstance.cpp

QmlDesigner: use initializer lists

2016-06-22 13:16:33 +00:00

positionernodeinstance.h

Wholesale conversion to #pragma once

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

qmlpropertychangesnodeinstance.cpp

Update License according to agreement with Free Qt Foundation

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

qmlpropertychangesnodeinstance.h

Wholesale conversion to #pragma once

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

qmlstatenodeinstance.cpp

QmlDesigner: Check for parent is not required

2016-11-11 07:28:35 +00:00

qmlstatenodeinstance.h

Wholesale conversion to #pragma once

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

qmltransitionnodeinstance.cpp

QmlDesigner: use initializer lists

2016-06-22 13:16:33 +00:00

qmltransitionnodeinstance.h

Wholesale conversion to #pragma once

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

qt5informationnodeinstanceserver.cpp

QmlPuppet: Make compile without QT_RESTRICTED_CAST_FROM_ASCII removed

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

qt5informationnodeinstanceserver.h

Wholesale conversion to #pragma once

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

qt5nodeinstanceclientproxy.cpp

Update License according to agreement with Free Qt Foundation

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

qt5nodeinstanceclientproxy.h

Wholesale conversion to #pragma once

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

qt5nodeinstanceserver.cpp

QmlDesigner: Allow qml2puppet to mockup C++ types

2016-10-04 08:59:24 +00:00

qt5nodeinstanceserver.h

Wholesale conversion to #pragma once

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

qt5previewnodeinstanceserver.cpp

QmlDesigner: Increase size of states editor

2018-04-10 13:19:32 +00:00

qt5previewnodeinstanceserver.h

Wholesale conversion to #pragma once

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

qt5rendernodeinstanceserver.cpp

Update License according to agreement with Free Qt Foundation

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

qt5rendernodeinstanceserver.h

Wholesale conversion to #pragma once

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

qt5testnodeinstanceserver.cpp

QmlPuppet: Make compile without QT_RESTRICTED_CAST_FROM_ASCII removed

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

qt5testnodeinstanceserver.h

Wholesale conversion to #pragma once

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

quickitemnodeinstance.cpp

QmlDesigner: Read contentItem after completing

2018-04-05 09:20:31 +00:00

quickitemnodeinstance.h

QmlDesigner: Add meta hint if item renders children directly

2018-03-09 15:05:22 +00:00

servernodeinstance.cpp

QmlDesigner: Add meta hint if item renders children directly

2018-03-09 15:05:22 +00:00

servernodeinstance.h

Wholesale conversion to #pragma once

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