2 Commits

Author	SHA1	Message	Date
Oswald Buddenhagen	1d78e594d8	Merge branch '2.2' ... Conflicts: qtcreator.pri share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp src/libs/qmljs/qmljsdocument.cpp src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/libs/qmljs/qmljslink.cpp src/plugins/cppeditor/cppquickfixes.cpp src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp src/plugins/qmldesigner/qmldesigner.pro src/plugins/qmldesigner/symbianplugin/symbian.metainfo src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h Change-Id: Id5f754e2837a3bb3e0687ed09f1dda45fd0c5617	2011-06-23 19:47:50 +02:00
Marco Bubke	8fe3302329	QmlDesigner.NodeInstances: Move qmlpuppet to share ... Change-Id: Id50d8c6130e9d5169a74015bc24e84de64eabfa7 Reviewed-on: http://codereview.qt.nokia.com/634 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>	2011-06-22 18:24:36 +02:00