feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
60ccecd7af009f1f8dfb4840d10ea146be007d3b
qt-creator/share/qtcreator/qml/qmlpuppet/instances
History
Eike Ziller 99ba300ae3 Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri
	src/libs/libs.pro
	src/plugins/debugger/watchwindow.cpp
	src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
2011-08-10 16:03:57 +02:00
..
anchorchangesnodeinstance.cpp
QmlDesigner: Fix for code style
2011-07-12 17:54:15 +02:00
anchorchangesnodeinstance.h
QmlDesigner: Fix for code style
2011-07-12 17:54:15 +02:00
behaviornodeinstance.cpp
QmlDesigner.NodeInstances: Fix restore bindings for reset
2011-07-14 16:53:08 +02:00
behaviornodeinstance.h
QmlDesigner.NodeInstances: Move qmlpuppet to share
2011-06-22 18:24:36 +02:00
childrenchangeeventfilter.cpp
QmlDesigner.NodeInstances: Move qmlpuppet to share
2011-06-22 18:24:36 +02:00
childrenchangeeventfilter.h
QmlDesigner.NodeInstances: Move qmlpuppet to share
2011-06-22 18:24:36 +02:00
componentnodeinstance.cpp
remove qDebug
2011-07-18 13:19:59 +02:00
componentnodeinstance.h
QmlDesigner.NodeInstances: Move qmlpuppet to share
2011-06-22 18:24:36 +02:00
dummycontextobject.cpp
QmlDesigner.NodeInstances: Move qmlpuppet to share
2011-06-22 18:24:36 +02:00
dummycontextobject.h
Remove unneeded defines.
2011-07-14 12:15:38 +02:00
dummynodeinstance.cpp
QmlDesigner.NodeInstances: Move qmlpuppet to share
2011-06-22 18:24:36 +02:00
dummynodeinstance.h
QmlDesigner.NodeInstances: Move qmlpuppet to share
2011-06-22 18:24:36 +02:00
instances.pri
QmlDesinger: Fix AnchorChanges are not exported
2011-07-11 16:41:40 +02:00
nodeinstanceclientproxy.cpp
QmlDesigner: Prevent item hoping for reparenting
2011-07-06 18:19:28 +02:00
nodeinstanceclientproxy.h
QmlDesigner: Prevent item hoping for reparenting
2011-07-06 18:19:28 +02:00
nodeinstancemetaobject.cpp
QmlDesigner.NodeInstances: Move qmlpuppet to share
2011-06-22 18:24:36 +02:00
nodeinstancemetaobject.h
QmlDesigner.NodeInstances: Move qmlpuppet to share
2011-06-22 18:24:36 +02:00
nodeinstanceserver.cpp
QmlDesigner.NodeInstances: Add a default dummy context
2011-07-27 20:14:24 +02:00
nodeinstanceserver.h
QmlDesigner.NodeInstances: Add a default dummy context
2011-07-27 20:14:24 +02:00
nodeinstancesignalspy.cpp
QmlDesigner.NodeInstances: Move qmlpuppet to share
2011-06-22 18:24:36 +02:00
nodeinstancesignalspy.h
QmlDesigner.NodeInstances: Move qmlpuppet to share
2011-06-22 18:24:36 +02:00
objectnodeinstance.cpp
QmlDesigner.NodeInstances: Show binding in text if invalid
2011-08-02 10:22:34 +02:00
objectnodeinstance.h
Merge branch '2.3'
2011-07-25 13:57:13 +02:00
qmlpropertychangesnodeinstance.cpp
QmlDesigner.NodeInstances: Fix restore bindings for reset
2011-07-14 16:53:08 +02:00
qmlpropertychangesnodeinstance.h
QmlDesigner.NodeInstances: Remove dead code
2011-07-07 19:22:35 +02:00
qmlstatenodeinstance.cpp
QmlDesigner.NodeInstances: Fix restore bindings for reset
2011-07-14 16:53:08 +02:00
qmlstatenodeinstance.h
QmlDesigner.NodeInstances: Move qmlpuppet to share
2011-06-22 18:24:36 +02:00
qmltransitionnodeinstance.cpp
QmlDesigner.NodeInstances: Fix restore bindings for reset
2011-07-14 16:53:08 +02:00
qmltransitionnodeinstance.h
QmlDesigner.NodeInstances: Move qmlpuppet to share
2011-06-22 18:24:36 +02:00
servernodeinstance.cpp
QmlDesinger: Fix AnchorChanges are not exported
2011-07-11 16:41:40 +02:00
servernodeinstance.h
QmlDesigner.NodeInstances: Move qmlpuppet to share
2011-06-22 18:24:36 +02:00