-
Oswald Buddenhagen authored
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
1d78e594