feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
a19495ba20da99a5b8688e02ee52d55f161440d8
qt-creator/share/qtcreator/qml/qmlpuppet/container
History
Eike Ziller 6faede0860 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
2012-09-27 20:38:57 +02:00
..
addimportcontainer.cpp
Contact -> qt-project.org
2012-07-19 13:23:21 +02:00
addimportcontainer.h
Contact -> qt-project.org
2012-07-19 13:23:21 +02:00
container.pri
QmlDesigner.NodeInstances: Move qmlpuppet to share
2011-06-22 18:24:36 +02:00
idcontainer.cpp
Contact -> qt-project.org
2012-07-19 13:23:21 +02:00
idcontainer.h
Contact -> qt-project.org
2012-07-19 13:23:21 +02:00
imagecontainer.cpp
Do not use qMemSet and qMemCopy.
2012-09-21 15:40:27 +02:00
imagecontainer.h
QmlDesigner.NodeInstances: Shared memory for value changes
2012-09-11 15:41:41 +02:00
informationcontainer.cpp
Contact -> qt-project.org
2012-07-19 13:23:21 +02:00
informationcontainer.h
Contact -> qt-project.org
2012-07-19 13:23:21 +02:00
instancecontainer.cpp
QmlDesigner.Instances: Refactor the qml2 puppet
2012-09-24 11:46:20 +02:00
instancecontainer.h
QmlDesigner: final compile fixes for 2.6 on Qt 5
2012-09-27 09:49:41 +02:00
propertyabstractcontainer.cpp
Contact -> qt-project.org
2012-07-19 13:23:21 +02:00
propertyabstractcontainer.h
Contact -> qt-project.org
2012-07-19 13:23:21 +02:00
propertybindingcontainer.cpp
Contact -> qt-project.org
2012-07-19 13:23:21 +02:00
propertybindingcontainer.h
Contact -> qt-project.org
2012-07-19 13:23:21 +02:00
propertyvaluecontainer.cpp
Contact -> qt-project.org
2012-07-19 13:23:21 +02:00
propertyvaluecontainer.h
Contact -> qt-project.org
2012-07-19 13:23:21 +02:00
reparentcontainer.cpp
QmlDesigner.Instances: Refactor the qml2 puppet
2012-09-24 11:46:20 +02:00
reparentcontainer.h
Merge remote-tracking branch 'origin/2.6'
2012-09-27 20:38:57 +02:00