feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
a2171c2d82b810e7f596f371a7d1d3cc6989a9dd
qt-creator/share/qtcreator/qml/qmlpuppet/qml2puppet/instances
History
Eike Ziller a2171c2d82 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
2013-05-03 09:49:28 +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.Instances: emit component complete signal for 5.1
2013-04-30 13:11:05 +02:00
graphicalnodeinstance.h
QmlDesigner.Instances: adding LayoutNodeInstance
2013-04-22 17:39:04 +02:00
instances.pri
Merge remote-tracking branch 'origin/2.7'
2013-04-23 11:13:25 +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: 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
Merge remote-tracking branch 'origin/2.7'
2013-04-23 11:13:25 +02:00
nodeinstanceserver.h
QmlDesigner: Type of the propertyname is now PropertyName
2013-03-25 13:35:11 +01:00
objectnodeinstance.cpp
QmlDesigner.Instances: The engine does set the QObject parent first
2013-04-30 13:11:18 +02:00
objectnodeinstance.h
Merge remote-tracking branch 'origin/2.7'
2013-04-23 11:13:25 +02:00
positionernodeinstance.cpp
QmlDesigner: Prepare for other layout items
2013-04-22 17:03:37 +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 remote-tracking branch 'origin/2.7'
2013-04-30 11:43:33 +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: Add GraphicalNodeInstance as abstraction for item and window
2013-04-22 17:03:23 +02:00
quickwindownodeinstance.h
QmlDesigner: Add GraphicalNodeInstance as abstraction for item and window
2013-04-22 17:03:23 +02:00
servernodeinstance.cpp
QmlDesigner.Instances: adding LayoutNodeInstance
2013-04-22 17:39:04 +02:00
servernodeinstance.h
QmlDesigner: Prepare for other layout items
2013-04-22 17:03:37 +02:00