feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
9ff8979da32642e60029cb7cf8536eed6442c270
qt-creator/share/qtcreator/qml/qmlpuppet/qml2puppet/instances
T
History
Eike Ziller 9ff8979da3 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/cpptools/cppchecksymbols.h
	src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp

Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
2013-04-11 18:27:52 +02:00
..
anchorchangesnodeinstance.cpp
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
anchorchangesnodeinstance.h
Incremented year in copyright info
2013-02-01 09:19:26 +01:00
behaviornodeinstance.cpp
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
behaviornodeinstance.h
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01: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
Incremented year in copyright info
2013-02-01 09:19:26 +01: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
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
dummynodeinstance.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
instances.pri
QmlDesigner: Remove NodeInstancesSignalSpy
2013-03-18 16:45:39 +01:00
nodeinstancemetaobject.cpp
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
nodeinstancemetaobject.h
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
nodeinstanceserver.cpp
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
nodeinstanceserver.h
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
objectnodeinstance.cpp
Merge remote-tracking branch 'origin/2.7'
2013-04-11 18:27:52 +02:00
objectnodeinstance.h
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
positionernodeinstance.cpp
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
positionernodeinstance.h
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
qmlpropertychangesnodeinstance.cpp
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
qmlpropertychangesnodeinstance.h
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
qmlstatenodeinstance.cpp
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
qmlstatenodeinstance.h
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
qmltransitionnodeinstance.cpp
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
qmltransitionnodeinstance.h
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
qt5informationnodeinstanceserver.cpp
Fix Krazy warnings about duplicate includes.
2013-03-20 15:04:10 +01:00
qt5informationnodeinstanceserver.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01: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
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
qt5previewnodeinstanceserver.cpp
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
qt5previewnodeinstanceserver.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
qt5rendernodeinstanceserver.cpp
Fix Krazy warnings about duplicate includes.
2013-03-20 15:04:10 +01:00
qt5rendernodeinstanceserver.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
quickitemnodeinstance.cpp
QmlDesigner.Instances: disabling the cursor after completing
2013-04-11 12:11:14 +02:00
quickitemnodeinstance.h
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
servernodeinstance.cpp
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
servernodeinstance.h
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00