From 8fe33023297fca0d9181dd26c58c37ab1007650d Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 22 Jun 2011 18:17:06 +0200 Subject: [PATCH] QmlDesigner.NodeInstances: Move qmlpuppet to share Change-Id: Id50d8c6130e9d5169a74015bc24e84de64eabfa7 Reviewed-on: http://codereview.qt.nokia.com/634 Reviewed-by: Qt Sanity Bot Reviewed-by: Thomas Hartmann --- .../commands/changeauxiliarycommand.cpp | 0 .../commands/changeauxiliarycommand.h | 0 .../commands/changebindingscommand.cpp | 0 .../commands/changebindingscommand.h | 0 .../commands/changefileurlcommand.cpp | 0 .../qmlpuppet/commands/changefileurlcommand.h | 0 .../qmlpuppet/commands/changeidscommand.cpp | 0 .../qmlpuppet/commands/changeidscommand.h | 0 .../commands/changenodesourcecommand.cpp | 0 .../commands/changenodesourcecommand.h | 0 .../qmlpuppet/commands/changestatecommand.cpp | 0 .../qmlpuppet/commands/changestatecommand.h | 0 .../commands/changevaluescommand.cpp | 0 .../qmlpuppet/commands/changevaluescommand.h | 0 .../commands/childrenchangedcommand.cpp | 0 .../commands/childrenchangedcommand.h | 0 .../qmlpuppet/commands/clearscenecommand.cpp | 0 .../qmlpuppet/commands/clearscenecommand.h | 0 .../qml}/qmlpuppet/commands/commands.pri | 0 .../commands/completecomponentcommand.cpp | 0 .../commands/completecomponentcommand.h | 0 .../commands/componentcompletedcommand.cpp | 0 .../commands/componentcompletedcommand.h | 0 .../commands/createinstancescommand.cpp | 0 .../commands/createinstancescommand.h | 0 .../qmlpuppet/commands/createscenecommand.cpp | 0 .../qmlpuppet/commands/createscenecommand.h | 0 .../commands/informationchangedcommand.cpp | 0 .../commands/informationchangedcommand.h | 0 .../commands/pixmapchangedcommand.cpp | 0 .../qmlpuppet/commands/pixmapchangedcommand.h | 0 .../commands/removeinstancescommand.cpp | 0 .../commands/removeinstancescommand.h | 0 .../commands/removepropertiescommand.cpp | 0 .../commands/removepropertiescommand.h | 0 .../commands/reparentinstancescommand.cpp | 0 .../commands/reparentinstancescommand.h | 0 .../statepreviewimagechangedcommand.cpp | 0 .../statepreviewimagechangedcommand.h | 0 .../qmlpuppet/commands/synchronizecommand.cpp | 0 .../qmlpuppet/commands/synchronizecommand.h | 0 .../commands/valueschangedcommand.cpp | 0 .../qmlpuppet/commands/valueschangedcommand.h | 0 .../container/addimportcontainer.cpp | 0 .../qmlpuppet/container/addimportcontainer.h | 0 .../qml}/qmlpuppet/container/container.pri | 0 .../qml}/qmlpuppet/container/idcontainer.cpp | 0 .../qml}/qmlpuppet/container/idcontainer.h | 0 .../qmlpuppet/container/imagecontainer.cpp | 0 .../qml}/qmlpuppet/container/imagecontainer.h | 0 .../container/informationcontainer.cpp | 0 .../container/informationcontainer.h | 0 .../qmlpuppet/container/instancecontainer.cpp | 0 .../qmlpuppet/container/instancecontainer.h | 0 .../container/propertyabstractcontainer.cpp | 0 .../container/propertyabstractcontainer.h | 0 .../container/propertybindingcontainer.cpp | 0 .../container/propertybindingcontainer.h | 0 .../container/propertyvaluecontainer.cpp | 0 .../container/propertyvaluecontainer.h | 0 .../qmlpuppet/container/reparentcontainer.cpp | 0 .../qmlpuppet/container/reparentcontainer.h | 0 .../qml}/qmlpuppet/html/welcome.html | 0 .../qml}/qmlpuppet/images/template_image.png | Bin .../qml}/qmlpuppet/images/webkit.png | Bin .../instances/behaviornodeinstance.cpp | 0 .../instances/behaviornodeinstance.h | 0 .../instances/childrenchangeeventfilter.cpp | 0 .../instances/childrenchangeeventfilter.h | 0 .../instances/componentnodeinstance.cpp | 0 .../instances/componentnodeinstance.h | 0 .../instances/dummycontextobject.cpp | 0 .../qmlpuppet/instances/dummycontextobject.h | 0 .../qmlpuppet/instances/dummynodeinstance.cpp | 0 .../qmlpuppet/instances/dummynodeinstance.h | 0 .../qml}/qmlpuppet/instances/instances.pri | 0 .../instances/nodeinstanceclientproxy.cpp | 0 .../instances/nodeinstanceclientproxy.h | 0 .../instances/nodeinstancemetaobject.cpp | 0 .../instances/nodeinstancemetaobject.h | 0 .../instances/nodeinstanceserver.cpp | 0 .../qmlpuppet/instances/nodeinstanceserver.h | 0 .../instances/nodeinstancesignalspy.cpp | 0 .../instances/nodeinstancesignalspy.h | 0 .../instances/objectnodeinstance.cpp | 0 .../qmlpuppet/instances/objectnodeinstance.h | 0 .../qmlpropertychangesnodeinstance.cpp | 0 .../qmlpropertychangesnodeinstance.h | 0 .../instances/qmlstatenodeinstance.cpp | 0 .../instances/qmlstatenodeinstance.h | 0 .../instances/qmltransitionnodeinstance.cpp | 0 .../instances/qmltransitionnodeinstance.h | 0 .../instances/servernodeinstance.cpp | 0 .../qmlpuppet/instances/servernodeinstance.h | 0 .../qml}/qmlpuppet/interfaces/commondefines.h | 0 .../qml}/qmlpuppet/interfaces/interfaces.pri | 0 .../interfaces/nodeinstanceclientinterface.h | 0 .../nodeinstanceserverinterface.cpp | 0 .../interfaces/nodeinstanceserverinterface.h | 0 .../qml}/qmlpuppet/qml2puppet/Info.plist.in | 0 .../qml2puppet/instances/instances.pri | 0 .../qt5informationnodeinstanceserver.cpp | 0 .../qt5informationnodeinstanceserver.h | 0 .../instances/qt5nodeinstanceclientproxy.cpp | 0 .../instances/qt5nodeinstanceclientproxy.h | 0 .../instances/qt5nodeinstanceserver.cpp | 0 .../instances/qt5nodeinstanceserver.h | 0 .../qt5previewnodeinstanceserver.cpp | 0 .../instances/qt5previewnodeinstanceserver.h | 0 .../instances/qt5rendernodeinstanceserver.cpp | 0 .../instances/qt5rendernodeinstanceserver.h | 0 .../instances/sgitemnodeinstance.cpp | 0 .../qml2puppet/instances/sgitemnodeinstance.h | 0 .../qml}/qmlpuppet/qml2puppet/main.cpp | 0 .../qml}/qmlpuppet/qml2puppet/qml2puppet.pro | 4 +-- share/qtcreator/qml/qmlpuppet/qmlpuppet.pro | 13 +++++++ .../qtcreator/qml}/qmlpuppet/qmlpuppet.qrc | 0 .../qml}/qmlpuppet/qmlpuppet/Info.plist.in | 0 .../instances/graphicsobjectnodeinstance.cpp | 0 .../instances/graphicsobjectnodeinstance.h | 0 .../qmlpuppet/instances/instances.pri | 0 .../instances/positionernodeinstance.cpp | 0 .../instances/positionernodeinstance.h | 0 .../instances/qmlgraphicsitemnodeinstance.cpp | 0 .../instances/qmlgraphicsitemnodeinstance.h | 0 .../qt4informationnodeinstanceserver.cpp | 0 .../qt4informationnodeinstanceserver.h | 0 .../instances/qt4nodeinstanceclientproxy.cpp | 0 .../instances/qt4nodeinstanceclientproxy.h | 0 .../instances/qt4nodeinstanceserver.cpp | 0 .../instances/qt4nodeinstanceserver.h | 0 .../qt4previewnodeinstanceserver.cpp | 0 .../instances/qt4previewnodeinstanceserver.h | 0 .../instances/qt4rendernodeinstanceserver.cpp | 0 .../instances/qt4rendernodeinstanceserver.h | 0 .../qml}/qmlpuppet/qmlpuppet/main.cpp | 0 .../qml/qmlpuppet/qmlpuppet/qmlpuppet.pri | 26 ++++++++++++++ .../qml/qmlpuppet/qmlpuppet/qmlpuppet.pro | 12 +++++++ .../qml/qmlpuppet/qmlpuppet_utilities.pri | 31 ++++++++++++++++ src/tools/qmlpuppet/qmlpuppet.pro | 4 --- src/tools/qmlpuppet/qmlpuppet/qmlpuppet.pro | 34 ++---------------- 141 files changed, 86 insertions(+), 38 deletions(-) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/changeauxiliarycommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/changeauxiliarycommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/changebindingscommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/changebindingscommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/changefileurlcommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/changefileurlcommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/changeidscommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/changeidscommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/changenodesourcecommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/changenodesourcecommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/changestatecommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/changestatecommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/changevaluescommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/changevaluescommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/childrenchangedcommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/childrenchangedcommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/clearscenecommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/clearscenecommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/commands.pri (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/completecomponentcommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/completecomponentcommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/componentcompletedcommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/componentcompletedcommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/createinstancescommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/createinstancescommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/createscenecommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/createscenecommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/informationchangedcommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/informationchangedcommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/pixmapchangedcommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/pixmapchangedcommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/removeinstancescommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/removeinstancescommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/removepropertiescommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/removepropertiescommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/reparentinstancescommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/reparentinstancescommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/statepreviewimagechangedcommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/statepreviewimagechangedcommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/synchronizecommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/synchronizecommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/valueschangedcommand.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/commands/valueschangedcommand.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/addimportcontainer.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/addimportcontainer.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/container.pri (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/idcontainer.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/idcontainer.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/imagecontainer.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/imagecontainer.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/informationcontainer.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/informationcontainer.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/instancecontainer.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/instancecontainer.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/propertyabstractcontainer.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/propertyabstractcontainer.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/propertybindingcontainer.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/propertybindingcontainer.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/propertyvaluecontainer.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/propertyvaluecontainer.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/reparentcontainer.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/container/reparentcontainer.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/html/welcome.html (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/images/template_image.png (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/images/webkit.png (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/behaviornodeinstance.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/behaviornodeinstance.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/childrenchangeeventfilter.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/childrenchangeeventfilter.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/componentnodeinstance.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/componentnodeinstance.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/dummycontextobject.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/dummycontextobject.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/dummynodeinstance.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/dummynodeinstance.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/instances.pri (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/nodeinstanceclientproxy.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/nodeinstanceclientproxy.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/nodeinstancemetaobject.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/nodeinstancemetaobject.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/nodeinstanceserver.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/nodeinstanceserver.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/nodeinstancesignalspy.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/nodeinstancesignalspy.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/objectnodeinstance.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/objectnodeinstance.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/qmlpropertychangesnodeinstance.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/qmlstatenodeinstance.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/qmlstatenodeinstance.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/qmltransitionnodeinstance.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/qmltransitionnodeinstance.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/servernodeinstance.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/instances/servernodeinstance.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/interfaces/commondefines.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/interfaces/interfaces.pri (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/interfaces/nodeinstanceclientinterface.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/interfaces/nodeinstanceserverinterface.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/Info.plist.in (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/instances/instances.pri (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/main.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qml2puppet/qml2puppet.pro (89%) create mode 100644 share/qtcreator/qml/qmlpuppet/qmlpuppet.pro rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet.qrc (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/Info.plist.in (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/instances.pri (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/positionernodeinstance.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/positionernodeinstance.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.cpp (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.h (100%) rename {src/tools => share/qtcreator/qml}/qmlpuppet/qmlpuppet/main.cpp (100%) create mode 100644 share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri create mode 100644 share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro create mode 100644 share/qtcreator/qml/qmlpuppet/qmlpuppet_utilities.pri diff --git a/src/tools/qmlpuppet/commands/changeauxiliarycommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/changeauxiliarycommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.cpp diff --git a/src/tools/qmlpuppet/commands/changeauxiliarycommand.h b/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/changeauxiliarycommand.h rename to share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.h diff --git a/src/tools/qmlpuppet/commands/changebindingscommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/changebindingscommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp diff --git a/src/tools/qmlpuppet/commands/changebindingscommand.h b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/changebindingscommand.h rename to share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h diff --git a/src/tools/qmlpuppet/commands/changefileurlcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/changefileurlcommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.cpp diff --git a/src/tools/qmlpuppet/commands/changefileurlcommand.h b/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/changefileurlcommand.h rename to share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.h diff --git a/src/tools/qmlpuppet/commands/changeidscommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/changeidscommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp diff --git a/src/tools/qmlpuppet/commands/changeidscommand.h b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/changeidscommand.h rename to share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h diff --git a/src/tools/qmlpuppet/commands/changenodesourcecommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/changenodesourcecommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.cpp diff --git a/src/tools/qmlpuppet/commands/changenodesourcecommand.h b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/changenodesourcecommand.h rename to share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h diff --git a/src/tools/qmlpuppet/commands/changestatecommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/changestatecommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/changestatecommand.cpp diff --git a/src/tools/qmlpuppet/commands/changestatecommand.h b/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/changestatecommand.h rename to share/qtcreator/qml/qmlpuppet/commands/changestatecommand.h diff --git a/src/tools/qmlpuppet/commands/changevaluescommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/changevaluescommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.cpp diff --git a/src/tools/qmlpuppet/commands/changevaluescommand.h b/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/changevaluescommand.h rename to share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.h diff --git a/src/tools/qmlpuppet/commands/childrenchangedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/childrenchangedcommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.cpp diff --git a/src/tools/qmlpuppet/commands/childrenchangedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/childrenchangedcommand.h rename to share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.h diff --git a/src/tools/qmlpuppet/commands/clearscenecommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/clearscenecommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.cpp diff --git a/src/tools/qmlpuppet/commands/clearscenecommand.h b/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/clearscenecommand.h rename to share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.h diff --git a/src/tools/qmlpuppet/commands/commands.pri b/share/qtcreator/qml/qmlpuppet/commands/commands.pri similarity index 100% rename from src/tools/qmlpuppet/commands/commands.pri rename to share/qtcreator/qml/qmlpuppet/commands/commands.pri diff --git a/src/tools/qmlpuppet/commands/completecomponentcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/completecomponentcommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.cpp diff --git a/src/tools/qmlpuppet/commands/completecomponentcommand.h b/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/completecomponentcommand.h rename to share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h diff --git a/src/tools/qmlpuppet/commands/componentcompletedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/componentcompletedcommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.cpp diff --git a/src/tools/qmlpuppet/commands/componentcompletedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/componentcompletedcommand.h rename to share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h diff --git a/src/tools/qmlpuppet/commands/createinstancescommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/createinstancescommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.cpp diff --git a/src/tools/qmlpuppet/commands/createinstancescommand.h b/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/createinstancescommand.h rename to share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.h diff --git a/src/tools/qmlpuppet/commands/createscenecommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/createscenecommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/createscenecommand.cpp diff --git a/src/tools/qmlpuppet/commands/createscenecommand.h b/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/createscenecommand.h rename to share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h diff --git a/src/tools/qmlpuppet/commands/informationchangedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/informationchangedcommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.cpp diff --git a/src/tools/qmlpuppet/commands/informationchangedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/informationchangedcommand.h rename to share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h diff --git a/src/tools/qmlpuppet/commands/pixmapchangedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/pixmapchangedcommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.cpp diff --git a/src/tools/qmlpuppet/commands/pixmapchangedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/pixmapchangedcommand.h rename to share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.h diff --git a/src/tools/qmlpuppet/commands/removeinstancescommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/removeinstancescommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.cpp diff --git a/src/tools/qmlpuppet/commands/removeinstancescommand.h b/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/removeinstancescommand.h rename to share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h diff --git a/src/tools/qmlpuppet/commands/removepropertiescommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/removepropertiescommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.cpp diff --git a/src/tools/qmlpuppet/commands/removepropertiescommand.h b/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/removepropertiescommand.h rename to share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h diff --git a/src/tools/qmlpuppet/commands/reparentinstancescommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/reparentinstancescommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.cpp diff --git a/src/tools/qmlpuppet/commands/reparentinstancescommand.h b/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/reparentinstancescommand.h rename to share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h diff --git a/src/tools/qmlpuppet/commands/statepreviewimagechangedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/statepreviewimagechangedcommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.cpp diff --git a/src/tools/qmlpuppet/commands/statepreviewimagechangedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/statepreviewimagechangedcommand.h rename to share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.h diff --git a/src/tools/qmlpuppet/commands/synchronizecommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/synchronizecommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.cpp diff --git a/src/tools/qmlpuppet/commands/synchronizecommand.h b/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/synchronizecommand.h rename to share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.h diff --git a/src/tools/qmlpuppet/commands/valueschangedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp similarity index 100% rename from src/tools/qmlpuppet/commands/valueschangedcommand.cpp rename to share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp diff --git a/src/tools/qmlpuppet/commands/valueschangedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.h similarity index 100% rename from src/tools/qmlpuppet/commands/valueschangedcommand.h rename to share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.h diff --git a/src/tools/qmlpuppet/container/addimportcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp similarity index 100% rename from src/tools/qmlpuppet/container/addimportcontainer.cpp rename to share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp diff --git a/src/tools/qmlpuppet/container/addimportcontainer.h b/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.h similarity index 100% rename from src/tools/qmlpuppet/container/addimportcontainer.h rename to share/qtcreator/qml/qmlpuppet/container/addimportcontainer.h diff --git a/src/tools/qmlpuppet/container/container.pri b/share/qtcreator/qml/qmlpuppet/container/container.pri similarity index 100% rename from src/tools/qmlpuppet/container/container.pri rename to share/qtcreator/qml/qmlpuppet/container/container.pri diff --git a/src/tools/qmlpuppet/container/idcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/idcontainer.cpp similarity index 100% rename from src/tools/qmlpuppet/container/idcontainer.cpp rename to share/qtcreator/qml/qmlpuppet/container/idcontainer.cpp diff --git a/src/tools/qmlpuppet/container/idcontainer.h b/share/qtcreator/qml/qmlpuppet/container/idcontainer.h similarity index 100% rename from src/tools/qmlpuppet/container/idcontainer.h rename to share/qtcreator/qml/qmlpuppet/container/idcontainer.h diff --git a/src/tools/qmlpuppet/container/imagecontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp similarity index 100% rename from src/tools/qmlpuppet/container/imagecontainer.cpp rename to share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp diff --git a/src/tools/qmlpuppet/container/imagecontainer.h b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.h similarity index 100% rename from src/tools/qmlpuppet/container/imagecontainer.h rename to share/qtcreator/qml/qmlpuppet/container/imagecontainer.h diff --git a/src/tools/qmlpuppet/container/informationcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp similarity index 100% rename from src/tools/qmlpuppet/container/informationcontainer.cpp rename to share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp diff --git a/src/tools/qmlpuppet/container/informationcontainer.h b/share/qtcreator/qml/qmlpuppet/container/informationcontainer.h similarity index 100% rename from src/tools/qmlpuppet/container/informationcontainer.h rename to share/qtcreator/qml/qmlpuppet/container/informationcontainer.h diff --git a/src/tools/qmlpuppet/container/instancecontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp similarity index 100% rename from src/tools/qmlpuppet/container/instancecontainer.cpp rename to share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp diff --git a/src/tools/qmlpuppet/container/instancecontainer.h b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h similarity index 100% rename from src/tools/qmlpuppet/container/instancecontainer.h rename to share/qtcreator/qml/qmlpuppet/container/instancecontainer.h diff --git a/src/tools/qmlpuppet/container/propertyabstractcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.cpp similarity index 100% rename from src/tools/qmlpuppet/container/propertyabstractcontainer.cpp rename to share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.cpp diff --git a/src/tools/qmlpuppet/container/propertyabstractcontainer.h b/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h similarity index 100% rename from src/tools/qmlpuppet/container/propertyabstractcontainer.h rename to share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h diff --git a/src/tools/qmlpuppet/container/propertybindingcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.cpp similarity index 100% rename from src/tools/qmlpuppet/container/propertybindingcontainer.cpp rename to share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.cpp diff --git a/src/tools/qmlpuppet/container/propertybindingcontainer.h b/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.h similarity index 100% rename from src/tools/qmlpuppet/container/propertybindingcontainer.h rename to share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.h diff --git a/src/tools/qmlpuppet/container/propertyvaluecontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.cpp similarity index 100% rename from src/tools/qmlpuppet/container/propertyvaluecontainer.cpp rename to share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.cpp diff --git a/src/tools/qmlpuppet/container/propertyvaluecontainer.h b/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.h similarity index 100% rename from src/tools/qmlpuppet/container/propertyvaluecontainer.h rename to share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.h diff --git a/src/tools/qmlpuppet/container/reparentcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.cpp similarity index 100% rename from src/tools/qmlpuppet/container/reparentcontainer.cpp rename to share/qtcreator/qml/qmlpuppet/container/reparentcontainer.cpp diff --git a/src/tools/qmlpuppet/container/reparentcontainer.h b/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h similarity index 100% rename from src/tools/qmlpuppet/container/reparentcontainer.h rename to share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h diff --git a/src/tools/qmlpuppet/html/welcome.html b/share/qtcreator/qml/qmlpuppet/html/welcome.html similarity index 100% rename from src/tools/qmlpuppet/html/welcome.html rename to share/qtcreator/qml/qmlpuppet/html/welcome.html diff --git a/src/tools/qmlpuppet/images/template_image.png b/share/qtcreator/qml/qmlpuppet/images/template_image.png similarity index 100% rename from src/tools/qmlpuppet/images/template_image.png rename to share/qtcreator/qml/qmlpuppet/images/template_image.png diff --git a/src/tools/qmlpuppet/images/webkit.png b/share/qtcreator/qml/qmlpuppet/images/webkit.png similarity index 100% rename from src/tools/qmlpuppet/images/webkit.png rename to share/qtcreator/qml/qmlpuppet/images/webkit.png diff --git a/src/tools/qmlpuppet/instances/behaviornodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/behaviornodeinstance.cpp similarity index 100% rename from src/tools/qmlpuppet/instances/behaviornodeinstance.cpp rename to share/qtcreator/qml/qmlpuppet/instances/behaviornodeinstance.cpp diff --git a/src/tools/qmlpuppet/instances/behaviornodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/behaviornodeinstance.h similarity index 100% rename from src/tools/qmlpuppet/instances/behaviornodeinstance.h rename to share/qtcreator/qml/qmlpuppet/instances/behaviornodeinstance.h diff --git a/src/tools/qmlpuppet/instances/childrenchangeeventfilter.cpp b/share/qtcreator/qml/qmlpuppet/instances/childrenchangeeventfilter.cpp similarity index 100% rename from src/tools/qmlpuppet/instances/childrenchangeeventfilter.cpp rename to share/qtcreator/qml/qmlpuppet/instances/childrenchangeeventfilter.cpp diff --git a/src/tools/qmlpuppet/instances/childrenchangeeventfilter.h b/share/qtcreator/qml/qmlpuppet/instances/childrenchangeeventfilter.h similarity index 100% rename from src/tools/qmlpuppet/instances/childrenchangeeventfilter.h rename to share/qtcreator/qml/qmlpuppet/instances/childrenchangeeventfilter.h diff --git a/src/tools/qmlpuppet/instances/componentnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/componentnodeinstance.cpp similarity index 100% rename from src/tools/qmlpuppet/instances/componentnodeinstance.cpp rename to share/qtcreator/qml/qmlpuppet/instances/componentnodeinstance.cpp diff --git a/src/tools/qmlpuppet/instances/componentnodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/componentnodeinstance.h similarity index 100% rename from src/tools/qmlpuppet/instances/componentnodeinstance.h rename to share/qtcreator/qml/qmlpuppet/instances/componentnodeinstance.h diff --git a/src/tools/qmlpuppet/instances/dummycontextobject.cpp b/share/qtcreator/qml/qmlpuppet/instances/dummycontextobject.cpp similarity index 100% rename from src/tools/qmlpuppet/instances/dummycontextobject.cpp rename to share/qtcreator/qml/qmlpuppet/instances/dummycontextobject.cpp diff --git a/src/tools/qmlpuppet/instances/dummycontextobject.h b/share/qtcreator/qml/qmlpuppet/instances/dummycontextobject.h similarity index 100% rename from src/tools/qmlpuppet/instances/dummycontextobject.h rename to share/qtcreator/qml/qmlpuppet/instances/dummycontextobject.h diff --git a/src/tools/qmlpuppet/instances/dummynodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/dummynodeinstance.cpp similarity index 100% rename from src/tools/qmlpuppet/instances/dummynodeinstance.cpp rename to share/qtcreator/qml/qmlpuppet/instances/dummynodeinstance.cpp diff --git a/src/tools/qmlpuppet/instances/dummynodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/dummynodeinstance.h similarity index 100% rename from src/tools/qmlpuppet/instances/dummynodeinstance.h rename to share/qtcreator/qml/qmlpuppet/instances/dummynodeinstance.h diff --git a/src/tools/qmlpuppet/instances/instances.pri b/share/qtcreator/qml/qmlpuppet/instances/instances.pri similarity index 100% rename from src/tools/qmlpuppet/instances/instances.pri rename to share/qtcreator/qml/qmlpuppet/instances/instances.pri diff --git a/src/tools/qmlpuppet/instances/nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp similarity index 100% rename from src/tools/qmlpuppet/instances/nodeinstanceclientproxy.cpp rename to share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp diff --git a/src/tools/qmlpuppet/instances/nodeinstanceclientproxy.h b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h similarity index 100% rename from src/tools/qmlpuppet/instances/nodeinstanceclientproxy.h rename to share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h diff --git a/src/tools/qmlpuppet/instances/nodeinstancemetaobject.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstancemetaobject.cpp similarity index 100% rename from src/tools/qmlpuppet/instances/nodeinstancemetaobject.cpp rename to share/qtcreator/qml/qmlpuppet/instances/nodeinstancemetaobject.cpp diff --git a/src/tools/qmlpuppet/instances/nodeinstancemetaobject.h b/share/qtcreator/qml/qmlpuppet/instances/nodeinstancemetaobject.h similarity index 100% rename from src/tools/qmlpuppet/instances/nodeinstancemetaobject.h rename to share/qtcreator/qml/qmlpuppet/instances/nodeinstancemetaobject.h diff --git a/src/tools/qmlpuppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp similarity index 100% rename from src/tools/qmlpuppet/instances/nodeinstanceserver.cpp rename to share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp diff --git a/src/tools/qmlpuppet/instances/nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.h similarity index 100% rename from src/tools/qmlpuppet/instances/nodeinstanceserver.h rename to share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.h diff --git a/src/tools/qmlpuppet/instances/nodeinstancesignalspy.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.cpp similarity index 100% rename from src/tools/qmlpuppet/instances/nodeinstancesignalspy.cpp rename to share/qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.cpp diff --git a/src/tools/qmlpuppet/instances/nodeinstancesignalspy.h b/share/qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.h similarity index 100% rename from src/tools/qmlpuppet/instances/nodeinstancesignalspy.h rename to share/qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.h diff --git a/src/tools/qmlpuppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp similarity index 100% rename from src/tools/qmlpuppet/instances/objectnodeinstance.cpp rename to share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp diff --git a/src/tools/qmlpuppet/instances/objectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h similarity index 100% rename from src/tools/qmlpuppet/instances/objectnodeinstance.h rename to share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h diff --git a/src/tools/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp similarity index 100% rename from src/tools/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp rename to share/qtcreator/qml/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp diff --git a/src/tools/qmlpuppet/instances/qmlpropertychangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/qmlpropertychangesnodeinstance.h similarity index 100% rename from src/tools/qmlpuppet/instances/qmlpropertychangesnodeinstance.h rename to share/qtcreator/qml/qmlpuppet/instances/qmlpropertychangesnodeinstance.h diff --git a/src/tools/qmlpuppet/instances/qmlstatenodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/qmlstatenodeinstance.cpp similarity index 100% rename from src/tools/qmlpuppet/instances/qmlstatenodeinstance.cpp rename to share/qtcreator/qml/qmlpuppet/instances/qmlstatenodeinstance.cpp diff --git a/src/tools/qmlpuppet/instances/qmlstatenodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/qmlstatenodeinstance.h similarity index 100% rename from src/tools/qmlpuppet/instances/qmlstatenodeinstance.h rename to share/qtcreator/qml/qmlpuppet/instances/qmlstatenodeinstance.h diff --git a/src/tools/qmlpuppet/instances/qmltransitionnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/qmltransitionnodeinstance.cpp similarity index 100% rename from src/tools/qmlpuppet/instances/qmltransitionnodeinstance.cpp rename to share/qtcreator/qml/qmlpuppet/instances/qmltransitionnodeinstance.cpp diff --git a/src/tools/qmlpuppet/instances/qmltransitionnodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/qmltransitionnodeinstance.h similarity index 100% rename from src/tools/qmlpuppet/instances/qmltransitionnodeinstance.h rename to share/qtcreator/qml/qmlpuppet/instances/qmltransitionnodeinstance.h diff --git a/src/tools/qmlpuppet/instances/servernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp similarity index 100% rename from src/tools/qmlpuppet/instances/servernodeinstance.cpp rename to share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp diff --git a/src/tools/qmlpuppet/instances/servernodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.h similarity index 100% rename from src/tools/qmlpuppet/instances/servernodeinstance.h rename to share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.h diff --git a/src/tools/qmlpuppet/interfaces/commondefines.h b/share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h similarity index 100% rename from src/tools/qmlpuppet/interfaces/commondefines.h rename to share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h diff --git a/src/tools/qmlpuppet/interfaces/interfaces.pri b/share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri similarity index 100% rename from src/tools/qmlpuppet/interfaces/interfaces.pri rename to share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri diff --git a/src/tools/qmlpuppet/interfaces/nodeinstanceclientinterface.h b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h similarity index 100% rename from src/tools/qmlpuppet/interfaces/nodeinstanceclientinterface.h rename to share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h diff --git a/src/tools/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp similarity index 100% rename from src/tools/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp rename to share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp diff --git a/src/tools/qmlpuppet/interfaces/nodeinstanceserverinterface.h b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h similarity index 100% rename from src/tools/qmlpuppet/interfaces/nodeinstanceserverinterface.h rename to share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h diff --git a/src/tools/qmlpuppet/qml2puppet/Info.plist.in b/share/qtcreator/qml/qmlpuppet/qml2puppet/Info.plist.in similarity index 100% rename from src/tools/qmlpuppet/qml2puppet/Info.plist.in rename to share/qtcreator/qml/qmlpuppet/qml2puppet/Info.plist.in diff --git a/src/tools/qmlpuppet/qml2puppet/instances/instances.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri similarity index 100% rename from src/tools/qmlpuppet/qml2puppet/instances/instances.pri rename to share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri diff --git a/src/tools/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp similarity index 100% rename from src/tools/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp rename to share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp diff --git a/src/tools/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h similarity index 100% rename from src/tools/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h rename to share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h diff --git a/src/tools/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp similarity index 100% rename from src/tools/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp rename to share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp diff --git a/src/tools/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h similarity index 100% rename from src/tools/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h rename to share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h diff --git a/src/tools/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp similarity index 100% rename from src/tools/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp rename to share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp diff --git a/src/tools/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h similarity index 100% rename from src/tools/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h rename to share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h diff --git a/src/tools/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp similarity index 100% rename from src/tools/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp rename to share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp diff --git a/src/tools/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h similarity index 100% rename from src/tools/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h rename to share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h diff --git a/src/tools/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp similarity index 100% rename from src/tools/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp rename to share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp diff --git a/src/tools/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h similarity index 100% rename from src/tools/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h rename to share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h diff --git a/src/tools/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp similarity index 100% rename from src/tools/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp rename to share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp diff --git a/src/tools/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.h similarity index 100% rename from src/tools/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.h rename to share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.h diff --git a/src/tools/qmlpuppet/qml2puppet/main.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp similarity index 100% rename from src/tools/qmlpuppet/qml2puppet/main.cpp rename to share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp diff --git a/src/tools/qmlpuppet/qml2puppet/qml2puppet.pro b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro similarity index 89% rename from src/tools/qmlpuppet/qml2puppet/qml2puppet.pro rename to share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro index 1edcb30464d..2cffe112d3a 100644 --- a/src/tools/qmlpuppet/qml2puppet/qml2puppet.pro +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro @@ -13,7 +13,7 @@ QT += core-private declarative-private gui-private script-private DEFINES += QWEAKPOINTER_ENABLE_ARROW include(../../../../qtcreator.pri) -DESTDIR = $$IDE_BIN_PATH +DESTDIR = $$[QT_INSTALL_BINS] include(../../../rpath.pri) include (instances/instances.pri) @@ -33,7 +33,7 @@ RESOURCES += ../qmlpuppet.qrc OTHER_FILES += Info.plist.in macx { info.input = Info.plist.in - info.output = $$IDE_BIN_PATH/$${TARGET}.app/Contents/Info.plist + info.output = $$DESTDIR/$${TARGET}.app/Contents/Info.plist QMAKE_SUBSTITUTES += info } else { target.path = /bin diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet.pro b/share/qtcreator/qml/qmlpuppet/qmlpuppet.pro new file mode 100644 index 00000000000..2703b4dd099 --- /dev/null +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet.pro @@ -0,0 +1,13 @@ +TEMPLATE = subdirs + +include(qmlpuppet_utilities.pri) + +exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) { + minQtVersion(4, 7, 1) { + SUBDIRS += qmlpuppet + } else { + warning(Qt 4.7.1 required!) + } +} else { + warning(No private headers in Qt!) +} diff --git a/src/tools/qmlpuppet/qmlpuppet.qrc b/share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet.qrc rename to share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc diff --git a/src/tools/qmlpuppet/qmlpuppet/Info.plist.in b/share/qtcreator/qml/qmlpuppet/qmlpuppet/Info.plist.in similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/Info.plist.in rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/Info.plist.in diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.cpp similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.cpp rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.cpp diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.h similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.h rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.h diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/instances.pri b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/instances.pri similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/instances.pri rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/instances.pri diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/positionernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/positionernodeinstance.cpp similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/positionernodeinstance.cpp rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/positionernodeinstance.cpp diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/positionernodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/positionernodeinstance.h similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/positionernodeinstance.h rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/positionernodeinstance.h diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.h similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.h rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.h diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.cpp similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.cpp rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.cpp diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.h similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.h rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.h diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.h similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.h rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.h diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.cpp similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.cpp rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.cpp diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.h similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.h rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.h diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.cpp similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.cpp rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.cpp diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.h similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.h rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.h diff --git a/src/tools/qmlpuppet/qmlpuppet/main.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp similarity index 100% rename from src/tools/qmlpuppet/qmlpuppet/main.cpp rename to share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri new file mode 100644 index 00000000000..01217ca152f --- /dev/null +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri @@ -0,0 +1,26 @@ +QT += core gui declarative network + +contains (QT_CONFIG, webkit) { + QT += webkit +} + +DEFINES += QWEAKPOINTER_ENABLE_ARROW + +include (instances/instances.pri) +include (../instances/instances.pri) +include (../commands/commands.pri) +include (../container/container.pri) +include (../interfaces/interfaces.pri) + +SOURCES += $$PWD/main.cpp +RESOURCES += $$PWD/../qmlpuppet.qrc + +OTHER_FILES += Info.plist.in +macx { + info.input = Info.plist.in + info.output = $$DESTDIR/$${TARGET}.app/Contents/Info.plist + QMAKE_SUBSTITUTES += info +} else { + target.path = /bin + INSTALLS += target +} \ No newline at end of file diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro new file mode 100644 index 00000000000..de16677d872 --- /dev/null +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro @@ -0,0 +1,12 @@ +TARGET = qmlpuppet + +TEMPLATE = app + +DESTDIR = $$[QT_INSTALL_BINS] + +build_all:!build_pass { + CONFIG -= build_all + CONFIG += release +} + +include(../../../../../share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri) \ No newline at end of file diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet_utilities.pri b/share/qtcreator/qml/qmlpuppet/qmlpuppet_utilities.pri new file mode 100644 index 00000000000..341550502a3 --- /dev/null +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet_utilities.pri @@ -0,0 +1,31 @@ +# Try to find location of Qt private headers (see README) +isEmpty(QT_PRIVATE_HEADERS) { + QT_PRIVATE_HEADERS = $$[QT_INSTALL_HEADERS] +} else { + INCLUDEPATH += \ + $${QT_PRIVATE_HEADERS} \ + $${QT_PRIVATE_HEADERS}/QtCore \ + $${QT_PRIVATE_HEADERS}/QtGui \ + $${QT_PRIVATE_HEADERS}/QtScript \ + $${QT_PRIVATE_HEADERS}/QtDeclarative +} + +defineTest(minQtVersion) { + maj = $$1 + min = $$2 + patch = $$3 + isEqual(QT_MAJOR_VERSION, $$maj) { + isEqual(QT_MINOR_VERSION, $$min) { + isEqual(QT_PATCH_VERSION, $$patch) { + return(true) + } + greaterThan(QT_PATCH_VERSION, $$patch) { + return(true) + } + } + greaterThan(QT_MINOR_VERSION, $$min) { + return(true) + } + } + return(false) +} diff --git a/src/tools/qmlpuppet/qmlpuppet.pro b/src/tools/qmlpuppet/qmlpuppet.pro index 2ef506f68eb..8fadbfe12f9 100644 --- a/src/tools/qmlpuppet/qmlpuppet.pro +++ b/src/tools/qmlpuppet/qmlpuppet.pro @@ -3,10 +3,6 @@ TEMPLATE = subdirs include(../../../qtcreator.pri) include(../../private_headers.pri) -minQtVersion(5, 0, 0) { - SUBDIRS += qml2puppet -} - exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) { minQtVersion(4, 7, 1) { SUBDIRS += qmlpuppet diff --git a/src/tools/qmlpuppet/qmlpuppet/qmlpuppet.pro b/src/tools/qmlpuppet/qmlpuppet/qmlpuppet.pro index 253fddf533b..a901cbbf9f2 100644 --- a/src/tools/qmlpuppet/qmlpuppet/qmlpuppet.pro +++ b/src/tools/qmlpuppet/qmlpuppet/qmlpuppet.pro @@ -7,39 +7,9 @@ include(../../../private_headers.pri) DESTDIR = $$IDE_BIN_PATH include(../../../rpath.pri) -QT += core gui declarative network - -contains (QT_CONFIG, webkit) { - QT += webkit -} -minQtVersion(5, 0, 0) { - QT += core-private declarative-private gui-private script-private -} -DEFINES += QWEAKPOINTER_ENABLE_ARROW - - - - -include (instances/instances.pri) -include (../instances/instances.pri) -include (../commands/commands.pri) -include (../container/container.pri) -include (../interfaces/interfaces.pri) +include(../../../../share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri) QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH) !isEmpty(QT_BREAKPAD_ROOT_PATH) { include($$QT_BREAKPAD_ROOT_PATH/qtbreakpad.pri) -} - -SOURCES += main.cpp -RESOURCES += ../qmlpuppet.qrc - -OTHER_FILES += Info.plist.in -macx { - info.input = Info.plist.in - info.output = $$IDE_BIN_PATH/$${TARGET}.app/Contents/Info.plist - QMAKE_SUBSTITUTES += info -} else { - target.path = /bin - INSTALLS += target -} +} \ No newline at end of file