Eike Ziller d8bd56bcd6 Merge remote-tracking branch 'origin/2.7' into 2.8 ...

Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/qbsprojectmanager/qbsbuildstep.cpp
	src/plugins/qbsprojectmanager/qbscleanstep.cpp
	src/plugins/qbsprojectmanager/qbsnodes.cpp
	src/shared/qbs

Change-Id: I8fc97ed61c47af2c3d9e5cc2bf81e97661204d4e

2013-05-24 16:20:10 +02:00

..

anchorchangesnodeinstance.cpp

QmlDesigner: Add override to qml2puppet

2013-04-16 16:52:20 +02:00

anchorchangesnodeinstance.h

QmlDesigner: Remove stupid code

2013-04-16 16:52:26 +02:00

behaviornodeinstance.cpp

QmlDesigner: Type of the propertyname is now PropertyName

2013-03-25 13:35:11 +01:00

behaviornodeinstance.h

QmlDesigner: Add override to qml2puppet

2013-04-16 16:52:20 +02:00

childrenchangeeventfilter.cpp

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

childrenchangeeventfilter.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

componentnodeinstance.cpp

Incremented year in copyright info

2013-02-01 09:19:26 +01:00

componentnodeinstance.h

QmlDesigner: Add override to qml2puppet

2013-04-16 16:52:20 +02:00

dummycontextobject.cpp

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

dummycontextobject.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

dummynodeinstance.cpp

QmlDesigner: Remove old functions in instances

2013-04-16 16:52:00 +02:00

dummynodeinstance.h

QmlDesigner: Add override to qml2puppet

2013-04-16 16:52:20 +02:00

graphicalnodeinstance.cpp

QmlDesigner: Add content item hack

2013-05-22 14:45:43 +02:00

graphicalnodeinstance.h

QmlDesigner: Add content item hack

2013-05-22 14:45:43 +02:00

instances.pri

Revert "QmlDesigner: Remove NodeInstancesSignalSpy"

2013-05-21 13:08:10 +02:00

layoutnodeinstance.cpp

QmlDesigner.Instances: adding LayoutNodeInstance

2013-04-22 17:39:04 +02:00

layoutnodeinstance.h

QmlDesigner.Instances: adding LayoutNodeInstance

2013-04-22 17:39:04 +02:00

nodeinstancemetaobject.cpp

QmlDesigner: Fix value change notification

2013-05-21 14:41:04 +02:00

nodeinstancemetaobject.h

QmlDesigner: Type of the propertyname is now PropertyName

2013-03-25 13:35:11 +01:00

nodeinstanceserver.cpp

QmlDesigner: Add content item hack

2013-05-22 14:45:43 +02:00

nodeinstanceserver.h

QmlDesigner: Type of the propertyname is now PropertyName

2013-03-25 13:35:11 +01:00

nodeinstancesignalspy.cpp

Revert "QmlDesigner: Remove NodeInstancesSignalSpy"

2013-05-21 13:08:10 +02:00

nodeinstancesignalspy.h

Revert "QmlDesigner: Remove NodeInstancesSignalSpy"

2013-05-21 13:08:10 +02:00

objectnodeinstance.cpp

QmlDesigner: Add content item hack

2013-05-22 14:45:43 +02:00

objectnodeinstance.h

QmlDesigner: Add content item hack

2013-05-22 14:45:43 +02:00

positionernodeinstance.cpp

Fix some compiler warnings

2013-05-17 08:13:18 +02:00

positionernodeinstance.h

QmlDesigner: Prepare for other layout items

2013-04-22 17:03:37 +02:00

qmlpropertychangesnodeinstance.cpp

QmlDesigner: Add override to qml2puppet

2013-04-16 16:52:20 +02:00

qmlpropertychangesnodeinstance.h

QmlDesigner: Remove stupid code

2013-04-16 16:52:26 +02:00

qmlstatenodeinstance.cpp

QmlDesigner: Type of the propertyname is now PropertyName

2013-03-25 13:35:11 +01:00

qmlstatenodeinstance.h

QmlDesigner: Add override to qml2puppet

2013-04-16 16:52:20 +02:00

qmltransitionnodeinstance.cpp

QmlDesigner: Type of the propertyname is now PropertyName

2013-03-25 13:35:11 +01:00

qmltransitionnodeinstance.h

QmlDesigner: Add override to qml2puppet

2013-04-16 16:52:20 +02:00

qt5informationnodeinstanceserver.cpp

Merge branch '2.7'

2013-05-15 10:21:47 +02:00

qt5informationnodeinstanceserver.h

QmlDesigner: We should test if untracked items are dirty too

2013-04-24 17:46:01 +02:00

qt5nodeinstanceclientproxy.cpp

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

qt5nodeinstanceclientproxy.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

qt5nodeinstanceserver.cpp

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

qt5nodeinstanceserver.h

QmlDesigner: Add override to qml2puppet

2013-04-16 16:52:20 +02:00

qt5previewnodeinstanceserver.cpp

QmlDesigner: Add GraphicalNodeInstance as abstraction for item and window

2013-04-22 17:03:23 +02:00

qt5previewnodeinstanceserver.h

QmlDesigner: Add override to qml2puppet

2013-04-16 16:52:20 +02:00

qt5rendernodeinstanceserver.cpp

Fix Krazy warnings about duplicate includes.

2013-03-20 15:04:10 +01:00

qt5rendernodeinstanceserver.h

QmlDesigner: Add override to qml2puppet

2013-04-16 16:52:20 +02:00

quickitemnodeinstance.cpp

QmlDesigner: Prepare for other layout items

2013-04-22 17:03:37 +02:00

quickitemnodeinstance.h

QmlDesigner: Add GraphicalNodeInstance as abstraction for item and window

2013-04-22 17:03:23 +02:00

quickwindownodeinstance.cpp

QmlDesigner.Instances: custom rendering for QQuickWindow

2013-05-23 15:35:46 +02:00

quickwindownodeinstance.h

QmlDesigner.Instances: custom rendering for QQuickWindow

2013-05-23 15:35:46 +02:00

servernodeinstance.cpp

QmlDesigner: Add content item hack

2013-05-22 14:45:43 +02:00

servernodeinstance.h

QmlDesigner: Add content item hack

2013-05-22 14:45:43 +02:00