141 files changed, 86 insertions, 38 deletions

diff --git a/src/tools/qmlpuppet/commands/changeauxiliarycommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.cpp
index ce195f801a..ce195f801a 100644
--- a/src/tools/qmlpuppet/commands/changeauxiliarycommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.cpp
diff --git a/src/tools/qmlpuppet/commands/changeauxiliarycommand.h b/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.h
index a81ef92021..a81ef92021 100644
--- a/src/tools/qmlpuppet/commands/changeauxiliarycommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.h
diff --git a/src/tools/qmlpuppet/commands/changebindingscommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp
index c8ad839057..c8ad839057 100644
--- a/src/tools/qmlpuppet/commands/changebindingscommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp
diff --git a/src/tools/qmlpuppet/commands/changebindingscommand.h b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h
index 0174153dc5..0174153dc5 100644
--- a/src/tools/qmlpuppet/commands/changebindingscommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h
diff --git a/src/tools/qmlpuppet/commands/changefileurlcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.cpp
index c5440ecd6c..c5440ecd6c 100644
--- a/src/tools/qmlpuppet/commands/changefileurlcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.cpp
diff --git a/src/tools/qmlpuppet/commands/changefileurlcommand.h b/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.h
index 221e7eff7d..221e7eff7d 100644
--- a/src/tools/qmlpuppet/commands/changefileurlcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.h
diff --git a/src/tools/qmlpuppet/commands/changeidscommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp
index c6c4658e34..c6c4658e34 100644
--- a/src/tools/qmlpuppet/commands/changeidscommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp
diff --git a/src/tools/qmlpuppet/commands/changeidscommand.h b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h
index 47e6f927f6..47e6f927f6 100644
--- a/src/tools/qmlpuppet/commands/changeidscommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h
diff --git a/src/tools/qmlpuppet/commands/changenodesourcecommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.cpp
index 65b427c21e..65b427c21e 100644
--- a/src/tools/qmlpuppet/commands/changenodesourcecommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.cpp
diff --git a/src/tools/qmlpuppet/commands/changenodesourcecommand.h b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
index 9a04e4811f..9a04e4811f 100644
--- a/src/tools/qmlpuppet/commands/changenodesourcecommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
diff --git a/src/tools/qmlpuppet/commands/changestatecommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.cpp
index 18dbfb651a..18dbfb651a 100644
--- a/src/tools/qmlpuppet/commands/changestatecommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.cpp
diff --git a/src/tools/qmlpuppet/commands/changestatecommand.h b/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.h
index 1d3e1f61ea..1d3e1f61ea 100644
--- a/src/tools/qmlpuppet/commands/changestatecommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.h
diff --git a/src/tools/qmlpuppet/commands/changevaluescommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.cpp
index 614ced2186..614ced2186 100644
--- a/src/tools/qmlpuppet/commands/changevaluescommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.cpp
diff --git a/src/tools/qmlpuppet/commands/changevaluescommand.h b/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.h
index 96ce13aa72..96ce13aa72 100644
--- a/src/tools/qmlpuppet/commands/changevaluescommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.h
diff --git a/src/tools/qmlpuppet/commands/childrenchangedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.cpp
index 7559998c81..7559998c81 100644
--- a/src/tools/qmlpuppet/commands/childrenchangedcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.cpp
diff --git a/src/tools/qmlpuppet/commands/childrenchangedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.h
index 8441c852a1..8441c852a1 100644
--- a/src/tools/qmlpuppet/commands/childrenchangedcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.h
diff --git a/src/tools/qmlpuppet/commands/clearscenecommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.cpp
index 59685d5b9b..59685d5b9b 100644
--- a/src/tools/qmlpuppet/commands/clearscenecommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.cpp
diff --git a/src/tools/qmlpuppet/commands/clearscenecommand.h b/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.h
index 52dbe7e965..52dbe7e965 100644
--- a/src/tools/qmlpuppet/commands/clearscenecommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.h
diff --git a/src/tools/qmlpuppet/commands/commands.pri b/share/qtcreator/qml/qmlpuppet/commands/commands.pri
index c6c9282d1b..c6c9282d1b 100644
--- a/src/tools/qmlpuppet/commands/commands.pri
+++ b/share/qtcreator/qml/qmlpuppet/commands/commands.pri
diff --git a/src/tools/qmlpuppet/commands/completecomponentcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.cpp
index 2f52f82d2b..2f52f82d2b 100644
--- a/src/tools/qmlpuppet/commands/completecomponentcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.cpp
diff --git a/src/tools/qmlpuppet/commands/completecomponentcommand.h b/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h
index 04af8ae044..04af8ae044 100644
--- a/src/tools/qmlpuppet/commands/completecomponentcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h
diff --git a/src/tools/qmlpuppet/commands/componentcompletedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.cpp
index 0fb0be0f51..0fb0be0f51 100644
--- a/src/tools/qmlpuppet/commands/componentcompletedcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.cpp
diff --git a/src/tools/qmlpuppet/commands/componentcompletedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h
index 95b67efc2f..95b67efc2f 100644
--- a/src/tools/qmlpuppet/commands/componentcompletedcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h
diff --git a/src/tools/qmlpuppet/commands/createinstancescommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.cpp
index dc2aed6260..dc2aed6260 100644
--- a/src/tools/qmlpuppet/commands/createinstancescommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.cpp
diff --git a/src/tools/qmlpuppet/commands/createinstancescommand.h b/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.h
index 737c011157..737c011157 100644
--- a/src/tools/qmlpuppet/commands/createinstancescommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.h
diff --git a/src/tools/qmlpuppet/commands/createscenecommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.cpp
index ed9a72f8b5..ed9a72f8b5 100644
--- a/src/tools/qmlpuppet/commands/createscenecommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.cpp
diff --git a/src/tools/qmlpuppet/commands/createscenecommand.h b/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h
index d37487c995..d37487c995 100644
--- a/src/tools/qmlpuppet/commands/createscenecommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h
diff --git a/src/tools/qmlpuppet/commands/informationchangedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.cpp
index 394a0731b6..394a0731b6 100644
--- a/src/tools/qmlpuppet/commands/informationchangedcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.cpp
diff --git a/src/tools/qmlpuppet/commands/informationchangedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h
index fae3450963..fae3450963 100644
--- a/src/tools/qmlpuppet/commands/informationchangedcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h
diff --git a/src/tools/qmlpuppet/commands/pixmapchangedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.cpp
index e5d9b7ac4c..e5d9b7ac4c 100644
--- a/src/tools/qmlpuppet/commands/pixmapchangedcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.cpp
diff --git a/src/tools/qmlpuppet/commands/pixmapchangedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.h
index 72ac843bee..72ac843bee 100644
--- a/src/tools/qmlpuppet/commands/pixmapchangedcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.h
diff --git a/src/tools/qmlpuppet/commands/removeinstancescommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.cpp
index bc0b9a5508..bc0b9a5508 100644
--- a/src/tools/qmlpuppet/commands/removeinstancescommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.cpp
diff --git a/src/tools/qmlpuppet/commands/removeinstancescommand.h b/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h
index 37477f8d32..37477f8d32 100644
--- a/src/tools/qmlpuppet/commands/removeinstancescommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h
diff --git a/src/tools/qmlpuppet/commands/removepropertiescommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.cpp
index 1ea4650407..1ea4650407 100644
--- a/src/tools/qmlpuppet/commands/removepropertiescommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.cpp
diff --git a/src/tools/qmlpuppet/commands/removepropertiescommand.h b/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h
index f00ee1679d..f00ee1679d 100644
--- a/src/tools/qmlpuppet/commands/removepropertiescommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h
diff --git a/src/tools/qmlpuppet/commands/reparentinstancescommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.cpp
index 4f5b6a381c..4f5b6a381c 100644
--- a/src/tools/qmlpuppet/commands/reparentinstancescommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.cpp
diff --git a/src/tools/qmlpuppet/commands/reparentinstancescommand.h b/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h
index 252db8334f..252db8334f 100644
--- a/src/tools/qmlpuppet/commands/reparentinstancescommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h
diff --git a/src/tools/qmlpuppet/commands/statepreviewimagechangedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.cpp
index 4d6e37cf1d..4d6e37cf1d 100644
--- a/src/tools/qmlpuppet/commands/statepreviewimagechangedcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.cpp
diff --git a/src/tools/qmlpuppet/commands/statepreviewimagechangedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.h
index 63ec0c7e07..63ec0c7e07 100644
--- a/src/tools/qmlpuppet/commands/statepreviewimagechangedcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.h
diff --git a/src/tools/qmlpuppet/commands/synchronizecommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.cpp
index d684c7e09d..d684c7e09d 100644
--- a/src/tools/qmlpuppet/commands/synchronizecommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.cpp
diff --git a/src/tools/qmlpuppet/commands/synchronizecommand.h b/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.h
index 5380677066..5380677066 100644
--- a/src/tools/qmlpuppet/commands/synchronizecommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.h
diff --git a/src/tools/qmlpuppet/commands/valueschangedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp
index 0e29b55f7c..0e29b55f7c 100644
--- a/src/tools/qmlpuppet/commands/valueschangedcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp
diff --git a/src/tools/qmlpuppet/commands/valueschangedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.h
index aba5bbd233..aba5bbd233 100644
--- a/src/tools/qmlpuppet/commands/valueschangedcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.h
diff --git a/src/tools/qmlpuppet/container/addimportcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp
index 178191b7d9..178191b7d9 100644
--- a/src/tools/qmlpuppet/container/addimportcontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp
diff --git a/src/tools/qmlpuppet/container/addimportcontainer.h b/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.h
index e039235347..e039235347 100644
--- a/src/tools/qmlpuppet/container/addimportcontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.h
diff --git a/src/tools/qmlpuppet/container/container.pri b/share/qtcreator/qml/qmlpuppet/container/container.pri
index 8889196708..8889196708 100644
--- a/src/tools/qmlpuppet/container/container.pri
+++ b/share/qtcreator/qml/qmlpuppet/container/container.pri
diff --git a/src/tools/qmlpuppet/container/idcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/idcontainer.cpp
index 6c71251541..6c71251541 100644
--- a/src/tools/qmlpuppet/container/idcontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/idcontainer.cpp
diff --git a/src/tools/qmlpuppet/container/idcontainer.h b/share/qtcreator/qml/qmlpuppet/container/idcontainer.h
index b37530f70a..b37530f70a 100644
--- a/src/tools/qmlpuppet/container/idcontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/idcontainer.h
diff --git a/src/tools/qmlpuppet/container/imagecontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp
index 10be2301c5..10be2301c5 100644
--- a/src/tools/qmlpuppet/container/imagecontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp
diff --git a/src/tools/qmlpuppet/container/imagecontainer.h b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.h
index a9767032c6..a9767032c6 100644
--- a/src/tools/qmlpuppet/container/imagecontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.h
diff --git a/src/tools/qmlpuppet/container/informationcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp
index 7339a207ba..7339a207ba 100644
--- a/src/tools/qmlpuppet/container/informationcontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp
diff --git a/src/tools/qmlpuppet/container/informationcontainer.h b/share/qtcreator/qml/qmlpuppet/container/informationcontainer.h
index 54bc98e823..54bc98e823 100644
--- a/src/tools/qmlpuppet/container/informationcontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/informationcontainer.h
diff --git a/src/tools/qmlpuppet/container/instancecontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp
index 57a1838576..57a1838576 100644
--- a/src/tools/qmlpuppet/container/instancecontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp
diff --git a/src/tools/qmlpuppet/container/instancecontainer.h b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h
index b80bec5d39..b80bec5d39 100644
--- a/src/tools/qmlpuppet/container/instancecontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h
diff --git a/src/tools/qmlpuppet/container/propertyabstractcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.cpp
index 9ebf023089..9ebf023089 100644
--- a/src/tools/qmlpuppet/container/propertyabstractcontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.cpp
diff --git a/src/tools/qmlpuppet/container/propertyabstractcontainer.h b/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h
index ab2cef8ce7..ab2cef8ce7 100644
--- a/src/tools/qmlpuppet/container/propertyabstractcontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h
diff --git a/src/tools/qmlpuppet/container/propertybindingcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.cpp
index 032a6e7351..032a6e7351 100644
--- a/src/tools/qmlpuppet/container/propertybindingcontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.cpp
diff --git a/src/tools/qmlpuppet/container/propertybindingcontainer.h b/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.h
index aefe1ab54a..aefe1ab54a 100644
--- a/src/tools/qmlpuppet/container/propertybindingcontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.h
diff --git a/src/tools/qmlpuppet/container/propertyvaluecontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.cpp
index 0840381ffe..0840381ffe 100644
--- a/src/tools/qmlpuppet/container/propertyvaluecontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.cpp
diff --git a/src/tools/qmlpuppet/container/propertyvaluecontainer.h b/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.h
index 1a1ec3d395..1a1ec3d395 100644
--- a/src/tools/qmlpuppet/container/propertyvaluecontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.h
diff --git a/src/tools/qmlpuppet/container/reparentcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.cpp
index cc5ec5e1a6..cc5ec5e1a6 100644
--- a/src/tools/qmlpuppet/container/reparentcontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.cpp
diff --git a/src/tools/qmlpuppet/container/reparentcontainer.h b/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
index b6e130e9c9..b6e130e9c9 100644
--- a/src/tools/qmlpuppet/container/reparentcontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
diff --git a/src/tools/qmlpuppet/html/welcome.html b/share/qtcreator/qml/qmlpuppet/html/welcome.html
index bde0a094e2..bde0a094e2 100644
--- a/src/tools/qmlpuppet/html/welcome.html
+++ b/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
index a62b3057bc..a62b3057bc 100644
--- a/src/tools/qmlpuppet/images/template_image.png
+++ b/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
index cf6d7f1c19..cf6d7f1c19 100644
--- a/src/tools/qmlpuppet/images/webkit.png
+++ b/share/qtcreator/qml/qmlpuppet/images/webkit.png
diff --git a/src/tools/qmlpuppet/instances/behaviornodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/behaviornodeinstance.cpp
index a89da2510b..a89da2510b 100644
--- a/src/tools/qmlpuppet/instances/behaviornodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/behaviornodeinstance.cpp
diff --git a/src/tools/qmlpuppet/instances/behaviornodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/behaviornodeinstance.h
index 3405c5d3a5..3405c5d3a5 100644
--- a/src/tools/qmlpuppet/instances/behaviornodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/behaviornodeinstance.h
diff --git a/src/tools/qmlpuppet/instances/childrenchangeeventfilter.cpp b/share/qtcreator/qml/qmlpuppet/instances/childrenchangeeventfilter.cpp
index 443228b636..443228b636 100644
--- a/src/tools/qmlpuppet/instances/childrenchangeeventfilter.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/childrenchangeeventfilter.cpp
diff --git a/src/tools/qmlpuppet/instances/childrenchangeeventfilter.h b/share/qtcreator/qml/qmlpuppet/instances/childrenchangeeventfilter.h
index 457e1d74d6..457e1d74d6 100644
--- a/src/tools/qmlpuppet/instances/childrenchangeeventfilter.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/childrenchangeeventfilter.h
diff --git a/src/tools/qmlpuppet/instances/componentnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/componentnodeinstance.cpp
index 6fae496a17..6fae496a17 100644
--- a/src/tools/qmlpuppet/instances/componentnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/componentnodeinstance.cpp
diff --git a/src/tools/qmlpuppet/instances/componentnodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/componentnodeinstance.h
index 32c4b34414..32c4b34414 100644
--- a/src/tools/qmlpuppet/instances/componentnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/componentnodeinstance.h
diff --git a/src/tools/qmlpuppet/instances/dummycontextobject.cpp b/share/qtcreator/qml/qmlpuppet/instances/dummycontextobject.cpp
index feeb4bcfe2..feeb4bcfe2 100644
--- a/src/tools/qmlpuppet/instances/dummycontextobject.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/dummycontextobject.cpp
diff --git a/src/tools/qmlpuppet/instances/dummycontextobject.h b/share/qtcreator/qml/qmlpuppet/instances/dummycontextobject.h
index 63843fd1ab..63843fd1ab 100644
--- a/src/tools/qmlpuppet/instances/dummycontextobject.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/dummycontextobject.h
diff --git a/src/tools/qmlpuppet/instances/dummynodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/dummynodeinstance.cpp
index cf17278c25..cf17278c25 100644
--- a/src/tools/qmlpuppet/instances/dummynodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/dummynodeinstance.cpp
diff --git a/src/tools/qmlpuppet/instances/dummynodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/dummynodeinstance.h
index 424aecd3d4..424aecd3d4 100644
--- a/src/tools/qmlpuppet/instances/dummynodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/dummynodeinstance.h
diff --git a/src/tools/qmlpuppet/instances/instances.pri b/share/qtcreator/qml/qmlpuppet/instances/instances.pri
index af88d6bd73..af88d6bd73 100644
--- a/src/tools/qmlpuppet/instances/instances.pri
+++ b/share/qtcreator/qml/qmlpuppet/instances/instances.pri
diff --git a/src/tools/qmlpuppet/instances/nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp
index ad10cdc57c..ad10cdc57c 100644
--- a/src/tools/qmlpuppet/instances/nodeinstanceclientproxy.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp
diff --git a/src/tools/qmlpuppet/instances/nodeinstanceclientproxy.h b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h
index 0ee07bf354..0ee07bf354 100644
--- a/src/tools/qmlpuppet/instances/nodeinstanceclientproxy.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h
diff --git a/src/tools/qmlpuppet/instances/nodeinstancemetaobject.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstancemetaobject.cpp
index 646452d339..646452d339 100644
--- a/src/tools/qmlpuppet/instances/nodeinstancemetaobject.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstancemetaobject.cpp
diff --git a/src/tools/qmlpuppet/instances/nodeinstancemetaobject.h b/share/qtcreator/qml/qmlpuppet/instances/nodeinstancemetaobject.h
index e19490a875..e19490a875 100644
--- a/src/tools/qmlpuppet/instances/nodeinstancemetaobject.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstancemetaobject.h
diff --git a/src/tools/qmlpuppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp
index 7c5e49fd71..7c5e49fd71 100644
--- a/src/tools/qmlpuppet/instances/nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp
diff --git a/src/tools/qmlpuppet/instances/nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.h
index bd45ec4849..bd45ec4849 100644
--- a/src/tools/qmlpuppet/instances/nodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.h
diff --git a/src/tools/qmlpuppet/instances/nodeinstancesignalspy.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.cpp
index cc7164adcd..cc7164adcd 100644
--- a/src/tools/qmlpuppet/instances/nodeinstancesignalspy.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.cpp
diff --git a/src/tools/qmlpuppet/instances/nodeinstancesignalspy.h b/share/qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.h
index 0f5a06788c..0f5a06788c 100644
--- a/src/tools/qmlpuppet/instances/nodeinstancesignalspy.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.h
diff --git a/src/tools/qmlpuppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
index d4d6204c7b..d4d6204c7b 100644
--- a/src/tools/qmlpuppet/instances/objectnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
diff --git a/src/tools/qmlpuppet/instances/objectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
index 4cc3fd155f..4cc3fd155f 100644
--- a/src/tools/qmlpuppet/instances/objectnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
diff --git a/src/tools/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp
index 4f706e4c7c..4f706e4c7c 100644
--- a/src/tools/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp
diff --git a/src/tools/qmlpuppet/instances/qmlpropertychangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/qmlpropertychangesnodeinstance.h
index 74480420c3..74480420c3 100644
--- a/src/tools/qmlpuppet/instances/qmlpropertychangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/qmlpropertychangesnodeinstance.h
diff --git a/src/tools/qmlpuppet/instances/qmlstatenodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/qmlstatenodeinstance.cpp
index 7ee19733c6..7ee19733c6 100644
--- a/src/tools/qmlpuppet/instances/qmlstatenodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/qmlstatenodeinstance.cpp
diff --git a/src/tools/qmlpuppet/instances/qmlstatenodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/qmlstatenodeinstance.h
index 4bd8c857b9..4bd8c857b9 100644
--- a/src/tools/qmlpuppet/instances/qmlstatenodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/qmlstatenodeinstance.h
diff --git a/src/tools/qmlpuppet/instances/qmltransitionnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/qmltransitionnodeinstance.cpp
index 0694d0d399..0694d0d399 100644
--- a/src/tools/qmlpuppet/instances/qmltransitionnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/qmltransitionnodeinstance.cpp
diff --git a/src/tools/qmlpuppet/instances/qmltransitionnodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/qmltransitionnodeinstance.h
index 7b823d0580..7b823d0580 100644
--- a/src/tools/qmlpuppet/instances/qmltransitionnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/qmltransitionnodeinstance.h
diff --git a/src/tools/qmlpuppet/instances/servernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp
index 63434ad2ff..63434ad2ff 100644
--- a/src/tools/qmlpuppet/instances/servernodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp
diff --git a/src/tools/qmlpuppet/instances/servernodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.h
index 4e722ee7fe..4e722ee7fe 100644
--- a/src/tools/qmlpuppet/instances/servernodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.h
diff --git a/src/tools/qmlpuppet/interfaces/commondefines.h b/share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h
index 1983c4eebc..1983c4eebc 100644
--- a/src/tools/qmlpuppet/interfaces/commondefines.h
+++ b/share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h
diff --git a/src/tools/qmlpuppet/interfaces/interfaces.pri b/share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
index 4e64200029..4e64200029 100644
--- a/src/tools/qmlpuppet/interfaces/interfaces.pri
+++ b/share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
diff --git a/src/tools/qmlpuppet/interfaces/nodeinstanceclientinterface.h b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h
index 77bf3355ef..77bf3355ef 100644
--- a/src/tools/qmlpuppet/interfaces/nodeinstanceclientinterface.h
+++ b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h
diff --git a/src/tools/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp
index ce2bb01042..ce2bb01042 100644
--- a/src/tools/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp
+++ b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp
diff --git a/src/tools/qmlpuppet/interfaces/nodeinstanceserverinterface.h b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h
index 98d1fe3865..98d1fe3865 100644
--- a/src/tools/qmlpuppet/interfaces/nodeinstanceserverinterface.h
+++ b/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
index b0406b7879..b0406b7879 100644
--- a/src/tools/qmlpuppet/qml2puppet/Info.plist.in
+++ b/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
index 1eeb3d40b5..1eeb3d40b5 100644
--- a/src/tools/qmlpuppet/qml2puppet/instances/instances.pri
+++ b/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
index 1e8cd6bdf3..1e8cd6bdf3 100644
--- a/src/tools/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/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
index c0c078fc47..c0c078fc47 100644
--- a/src/tools/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
+++ b/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
index b66784a9a5..b66784a9a5 100644
--- a/src/tools/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp
+++ b/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
index 2739bddbc9..2739bddbc9 100644
--- a/src/tools/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h
+++ b/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
index a97b2202ec..a97b2202ec 100644
--- a/src/tools/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
+++ b/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
index 4faa447eee..4faa447eee 100644
--- a/src/tools/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
+++ b/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
index e432ba32fa..e432ba32fa 100644
--- a/src/tools/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
+++ b/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
index bf60721274..bf60721274 100644
--- a/src/tools/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h
+++ b/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
index e25c0ce3b1..e25c0ce3b1 100644
--- a/src/tools/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
+++ b/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
index 78aae47692..78aae47692 100644
--- a/src/tools/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
+++ b/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
index 8735ddf7d5..8735ddf7d5 100644
--- a/src/tools/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp
+++ b/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
index de17a6216e..de17a6216e 100644
--- a/src/tools/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.h
+++ b/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
index f1b1c6b90e..f1b1c6b90e 100644
--- a/src/tools/qmlpuppet/qml2puppet/main.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp
diff --git a/src/tools/qmlpuppet/qml2puppet/qml2puppet.pro b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro
index 1edcb30464..2cffe112d3 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 0000000000..2703b4dd09
--- /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
index ceb6142cb3..ceb6142cb3 100644
--- a/src/tools/qmlpuppet/qmlpuppet.qrc
+++ b/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
index 7d0d6a1039..7d0d6a1039 100644
--- a/src/tools/qmlpuppet/qmlpuppet/Info.plist.in
+++ b/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
index 306165709f..306165709f 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.cpp
+++ b/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
index dd4b819704..dd4b819704 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.h
+++ b/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
index 890faf94ae..890faf94ae 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/instances.pri
+++ b/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
index 718f8a3f06..718f8a3f06 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/positionernodeinstance.cpp
+++ b/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
index 1a0406e274..1a0406e274 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/positionernodeinstance.h
+++ b/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
index 13c8a105f5..13c8a105f5 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp
+++ b/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
index 31a1f2c285..31a1f2c285 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h
+++ b/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
index bbde41f8d9..bbde41f8d9 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp
+++ b/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
index ea5aa990e9..ea5aa990e9 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.h
+++ b/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
index 91fe2417c0..91fe2417c0 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.cpp
+++ b/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
index 4722a2df23..4722a2df23 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.h
+++ b/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
index 75cc69993a..75cc69993a 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp
+++ b/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
index 60c41f2780..60c41f2780 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.h
+++ b/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
index fd90a0e1f7..fd90a0e1f7 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.cpp
+++ b/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
index 1c64519861..1c64519861 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.h
+++ b/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
index abeeda1e20..abeeda1e20 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.cpp
+++ b/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
index dde4056a65..dde4056a65 100644
--- a/src/tools/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.h
+++ b/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
index bbc168008f..bbc168008f 100644
--- a/src/tools/qmlpuppet/qmlpuppet/main.cpp
+++ b/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 0000000000..01217ca152
--- /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 0000000000..de16677d87
--- /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 0000000000..341550502a
--- /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 2ef506f68e..8fadbfe12f 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 253fddf533..a901cbbf9f 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