QmlDesigner: QmlPuppet as standalone tool

The qmlpuppet is now a standalone tool. There is new a library too with
the communication code. That is shared between the designer and the
puppet. It's in a .cmake file so it can be included by the standalone
tool if it is not part of a designer build.

Task-number: QDS-5879
Change-Id: I2bc2a0b463fbb3e0c8c23d182abfd368cf87e968
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

324 files changed, 133 insertions, 451 deletions

diff --git a/share/qtcreator/CMakeLists.txt b/share/qtcreator/CMakeLists.txt
index 25d976ea9c..5bd0f05bf2 100644
--- a/share/qtcreator/CMakeLists.txt
+++ b/share/qtcreator/CMakeLists.txt
@@ -4,7 +4,6 @@ set(resource_directories
   glsl
   indexer_preincludes
   modeleditor
-  qml
   qmldesigner
   qmlicons
   qml-type-descriptions
diff --git a/share/qtcreator/qml/qmlpuppet/commands/commands.pri b/share/qtcreator/qml/qmlpuppet/commands/commands.pri
deleted file mode 100644
index 0fb8e0132c..0000000000
--- a/share/qtcreator/qml/qmlpuppet/commands/commands.pri
+++ /dev/null
@@ -1,75 +0,0 @@
-INCLUDEPATH += $$PWD $$PWD/../interfaces
-
-HEADERS += $$PWD/synchronizecommand.h \ \
-    $$PWD/captureddatacommand.h \
-    $$PWD/changepreviewimagesizecommand.h \
-    $$PWD/changelanguagecommand.h \
-    $$PWD//debugoutputcommand.h \
-    $$PWD/endpuppetcommand.h \
-    $$PWD/scenecreatedcommand.h \
-    $$PWD/tokencommand.h \
-    $$PWD/componentcompletedcommand.h \
-    $$PWD/completecomponentcommand.h \
-    $$PWD/statepreviewimagechangedcommand.h \
-    $$PWD/childrenchangedcommand.h \
-    $$PWD/changebindingscommand.h \
-    $$PWD/changefileurlcommand.h \
-    $$PWD/changeidscommand.h \
-    $$PWD/changenodesourcecommand.h \
-    $$PWD/changestatecommand.h \
-    $$PWD/changevaluescommand.h \
-    $$PWD/createscenecommand.h \
-    $$PWD/clearscenecommand.h \
-    $$PWD/createinstancescommand.h \
-    $$PWD/informationchangedcommand.h \
-    $$PWD/nanotracecommand.h \
-    $$PWD/pixmapchangedcommand.h \
-    $$PWD/removeinstancescommand.h \
-    $$PWD/removepropertiescommand.h \
-    $$PWD/reparentinstancescommand.h \
-    $$PWD/valueschangedcommand.h \
-    $$PWD/changeauxiliarycommand.h \
-    $$PWD/removesharedmemorycommand.h \
-    $$PWD/puppetalivecommand.h \
-    $$PWD/changeselectioncommand.h \
-    $$PWD/update3dviewstatecommand.h \
-    $$PWD/puppettocreatorcommand.h \
-    $$PWD/inputeventcommand.h \
-    $$PWD/view3dactioncommand.h \
-    $$PWD/requestmodelnodepreviewimagecommand.h
-
-SOURCES += \
-    $$PWD/changepreviewimagesizecommand.cpp \
-    $$PWD/changelanguagecommand.cpp \
-    $$PWD/debugoutputcommand.cpp \
-    $$PWD/endpuppetcommand.cpp \
-    $$PWD/tokencommand.cpp \
-    $$PWD/componentcompletedcommand.cpp \
-    $$PWD/completecomponentcommand.cpp \
-    $$PWD/statepreviewimagechangedcommand.cpp \
-    $$PWD/childrenchangedcommand.cpp \
-    $$PWD/changebindingscommand.cpp \
-    $$PWD/changefileurlcommand.cpp \
-    $$PWD/changeidscommand.cpp \
-    $$PWD/changenodesourcecommand.cpp \
-    $$PWD/changestatecommand.cpp \
-    $$PWD/changevaluescommand.cpp \
-    $$PWD/informationchangedcommand.cpp \
-    $$PWD/nanotracecommand.cpp \
-    $$PWD/removeinstancescommand.cpp \
-    $$PWD/removepropertiescommand.cpp \
-    $$PWD/reparentinstancescommand.cpp \
-    $$PWD/valueschangedcommand.cpp \
-    $$PWD/clearscenecommand.cpp \
-    $$PWD/createinstancescommand.cpp \
-    $$PWD/createscenecommand.cpp \
-    $$PWD/pixmapchangedcommand.cpp \
-    $$PWD/changeauxiliarycommand.cpp \
-    $$PWD/removesharedmemorycommand.cpp \
-    $$PWD/puppetalivecommand.cpp \
-    $$PWD/changeselectioncommand.cpp \
-    $$PWD/update3dviewstatecommand.cpp \
-    $$PWD/puppettocreatorcommand.cpp \
-    $$PWD/inputeventcommand.cpp \
-    $$PWD/view3dactioncommand.cpp \
-    $$PWD/requestmodelnodepreviewimagecommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/container/container.pri b/share/qtcreator/qml/qmlpuppet/container/container.pri
deleted file mode 100644
index 381e5cf117..0000000000
--- a/share/qtcreator/qml/qmlpuppet/container/container.pri
+++ /dev/null
@@ -1,26 +0,0 @@
-INCLUDEPATH += $$PWD/
-
-HEADERS += $$PWD/addimportcontainer.h
-HEADERS += $$PWD/mockuptypecontainer.h
-HEADERS += $$PWD/sharedmemory.h
-HEADERS += $$PWD/imagecontainer.h
-HEADERS += $$PWD/idcontainer.h
-HEADERS += $$PWD/informationcontainer.h
-HEADERS += $$PWD/instancecontainer.h
-HEADERS += $$PWD/reparentcontainer.h
-HEADERS += $$PWD/propertyabstractcontainer.h
-HEADERS += $$PWD/propertybindingcontainer.h
-HEADERS += $$PWD/propertyvaluecontainer.h
-
-SOURCES += $$PWD/addimportcontainer.cpp
-SOURCES += $$PWD/mockuptypecontainer.cpp
-unix:SOURCES += $$PWD/sharedmemory_unix.cpp
-!unix:SOURCES += $$PWD/sharedmemory_qt.cpp
-SOURCES += $$PWD/imagecontainer.cpp
-SOURCES += $$PWD/idcontainer.cpp
-SOURCES += $$PWD/informationcontainer.cpp
-SOURCES += $$PWD/instancecontainer.cpp
-SOURCES += $$PWD/reparentcontainer.cpp
-SOURCES += $$PWD/propertyabstractcontainer.cpp
-SOURCES += $$PWD/propertybindingcontainer.cpp
-SOURCES += $$PWD/propertyvaluecontainer.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri b/share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
deleted file mode 100644
index aeaf3a765e..0000000000
--- a/share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
+++ /dev/null
@@ -1,8 +0,0 @@
-INCLUDEPATH += $$PWD/
-
-HEADERS += $$PWD/nodeinstanceclientinterface.h
-HEADERS += $$PWD/nodeinstanceglobal.h
-HEADERS += $$PWD/nodeinstanceserverinterface.h
-HEADERS += $$PWD/commondefines.h
-
-SOURCES += $$PWD/nodeinstanceserverinterface.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
deleted file mode 100644
index 0b364d32b3..0000000000
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
+++ /dev/null
@@ -1,46 +0,0 @@
-QT += core gui widgets qml quick network
-QT += core-private qml-private quick-private gui-private
-
-CONFIG += c++17
-win32:!mingw: QMAKE_CXXFLAGS += /std:c++17
-
-DEFINES -= QT_CREATOR
-
-# This .pri file contains classes to enable a special multilanguage translator
-MULTILANGUAGE_SUPPORT_PRI=$$(MULTILANGUAGE_SUPPORT_PRI)
-!isEmpty(MULTILANGUAGE_SUPPORT_PRI) {
-    exists($$(MULTILANGUAGE_SUPPORT_PRI)): message(including \"$$(MULTILANGUAGE_SUPPORT_PRI)\")
-    else: error("MULTILANGUAGE_SUPPORT_PRI: \"$$(MULTILANGUAGE_SUPPORT_PRI)\" does not exist.")
-    include($$(MULTILANGUAGE_SUPPORT_PRI))
-    DEFINES += MULTILANGUAGE_TRANSLATIONPROVIDER
-}
-
-include (editor3d/editor3d.pri)
-include (../instances/instances.pri)
-include (instances/instances.pri)
-include (../commands/commands.pri)
-include (../container/container.pri)
-include (../interfaces/interfaces.pri)
-include (../types/types.pri)
-include (../qmlprivategate/qmlprivategate.pri)
-include (iconrenderer/iconrenderer.pri)
-include (import3d/import3d.pri)
-
-SOURCES +=  $$PWD/qml2puppetmain.cpp
-RESOURCES +=  $$PWD/../qmlpuppet.qrc
-
-versionAtLeast(QT_VERSION, 6.0.0): RESOURCES += $$PWD/../editor3d_qt6.qrc
-else: RESOURCES += $$PWD/../editor3d_qt5.qrc
-
-DISTFILES += Info.plist
-
-unix:!openbsd:!osx: LIBS += -lrt # posix shared memory
-
-osx {
-    CONFIG -= app_bundle
-    QMAKE_LFLAGS += -Wl,-sectcreate,__TEXT,__info_plist,$$system_quote($$PWD/Info.plist)
-}
-
-osx:  target.path = $$INSTALL_LIBEXEC_PATH/qmldesigner
-else: target.path = $$INSTALL_LIBEXEC_PATH
-INSTALLS += target
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro
deleted file mode 100644
index 1457e8d10e..0000000000
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET = qml2puppet
-
-TEMPLATE = app
-CONFIG += console
-
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
-
-include(qml2puppet.pri)
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet_utilities.pri b/share/qtcreator/qml/qmlpuppet/qmlpuppet_utilities.pri
deleted file mode 100644
index 341550502a..0000000000
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet_utilities.pri
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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/share/qtcreator/qml/qmlpuppet/types/types.pri b/share/qtcreator/qml/qmlpuppet/types/types.pri
deleted file mode 100644
index e5f10bcbe4..0000000000
--- a/share/qtcreator/qml/qmlpuppet/types/types.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-INCLUDEPATH += $$PWD/
-
-HEADERS += $$PWD/enumeration.h
diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt
index 7265810737..0f2b340939 100644
--- a/src/libs/CMakeLists.txt
+++ b/src/libs/CMakeLists.txt
@@ -15,6 +15,7 @@ add_subdirectory(glsl)
 add_subdirectory(languageserverprotocol)
 add_subdirectory(sqlite)
 add_subdirectory(tracing)
+add_subdirectory(qmlpuppetcommunication)
 
 add_subdirectory(qtcreatorcdbext)
 
diff --git a/src/libs/qmlpuppetcommunication/CMakeLists.txt b/src/libs/qmlpuppetcommunication/CMakeLists.txt
new file mode 100644
index 0000000000..a6b74f58e6
--- /dev/null
+++ b/src/libs/qmlpuppetcommunication/CMakeLists.txt
@@ -0,0 +1 @@
+include(QmlPuppetCommunication.cmake)
diff --git a/src/libs/qmlpuppetcommunication/QmlPuppetCommunication.cmake b/src/libs/qmlpuppetcommunication/QmlPuppetCommunication.cmake
new file mode 100644
index 0000000000..43cbc78af2
--- /dev/null
+++ b/src/libs/qmlpuppetcommunication/QmlPuppetCommunication.cmake
@@ -0,0 +1,87 @@
+add_qtc_library(QmlPuppetCommunication STATIC
+    PROPERTIES AUTOUIC OFF
+    DEPENDS Qt5::Core Qt5::CorePrivate Qt5::Gui
+)
+
+extend_qtc_library(QmlPuppetCommunication
+  CONDITION TARGET Nanotrace
+  PUBLIC_DEPENDS Nanotrace
+)
+
+extend_qtc_library(QmlPuppetCommunication
+  PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/types
+  SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/types
+  SOURCES
+    enumeration.h
+)
+
+extend_qtc_library(QmlPuppetCommunication
+  PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/interfaces
+  SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/interfaces
+  SOURCES
+    commondefines.h
+    nodeinstanceclientinterface.h
+    nodeinstanceserverinterface.cpp nodeinstanceserverinterface.h
+    nodeinstanceglobal.h
+)
+
+extend_qtc_library(QmlPuppetCommunication
+  PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/container
+  SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/container
+  SOURCES
+    addimportcontainer.cpp addimportcontainer.h
+    idcontainer.cpp idcontainer.h
+    imagecontainer.cpp imagecontainer.h
+    informationcontainer.cpp informationcontainer.h
+    instancecontainer.cpp instancecontainer.h
+    mockuptypecontainer.cpp mockuptypecontainer.h
+    propertyabstractcontainer.cpp propertyabstractcontainer.h
+    propertybindingcontainer.cpp propertybindingcontainer.h
+    propertyvaluecontainer.cpp propertyvaluecontainer.h
+    reparentcontainer.cpp reparentcontainer.h
+    sharedmemory.h
+    $<IF:$<BOOL:${UNIX}>,sharedmemory_unix.cpp,sharedmemory_qt.cpp>
+)
+
+extend_qtc_library(QmlPuppetCommunication
+  PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/commands
+  SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/commands
+  SOURCES
+    captureddatacommand.h
+    changeauxiliarycommand.cpp changeauxiliarycommand.h
+    changebindingscommand.cpp changebindingscommand.h
+    changefileurlcommand.cpp changefileurlcommand.h
+    changeidscommand.cpp  changeidscommand.h
+    changelanguagecommand.cpp changelanguagecommand.h
+    changenodesourcecommand.cpp changenodesourcecommand.h
+    changepreviewimagesizecommand.cpp changepreviewimagesizecommand.h
+    changeselectioncommand.cpp changeselectioncommand.h
+    changestatecommand.cpp changestatecommand.h
+    changevaluescommand.cpp changevaluescommand.h
+    childrenchangedcommand.cpp childrenchangedcommand.h
+    clearscenecommand.cpp clearscenecommand.h
+    completecomponentcommand.cpp completecomponentcommand.h
+    componentcompletedcommand.cpp componentcompletedcommand.h
+    createinstancescommand.cpp createinstancescommand.h
+    createscenecommand.cpp createscenecommand.h
+    debugoutputcommand.cpp debugoutputcommand.h
+    endpuppetcommand.cpp endpuppetcommand.h
+    informationchangedcommand.cpp informationchangedcommand.h
+    inputeventcommand.cpp inputeventcommand.h
+    nanotracecommand.cpp nanotracecommand.h
+    pixmapchangedcommand.cpp pixmapchangedcommand.h
+    puppetalivecommand.cpp puppetalivecommand.h
+    puppettocreatorcommand.cpp puppettocreatorcommand.h
+    removeinstancescommand.cpp removeinstancescommand.h
+    removepropertiescommand.cpp removepropertiescommand.h
+    removesharedmemorycommand.cpp removesharedmemorycommand.h
+    reparentinstancescommand.cpp reparentinstancescommand.h
+    requestmodelnodepreviewimagecommand.cpp requestmodelnodepreviewimagecommand.h
+    scenecreatedcommand.h
+    statepreviewimagechangedcommand.cpp statepreviewimagechangedcommand.h
+    synchronizecommand.h
+    tokencommand.cpp tokencommand.h
+    update3dviewstatecommand.cpp update3dviewstatecommand.h
+    valueschangedcommand.cpp valueschangedcommand.h
+    view3dactioncommand.cpp view3dactioncommand.h
+)
diff --git a/share/qtcreator/qml/qmlpuppet/commands/captureddatacommand.h b/src/libs/qmlpuppetcommunication/commands/captureddatacommand.h
index 25f580e0b2..25f580e0b2 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/captureddatacommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/captureddatacommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.cpp b/src/libs/qmlpuppetcommunication/commands/changeauxiliarycommand.cpp
index 1d61f21e89..1d61f21e89 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/changeauxiliarycommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.h b/src/libs/qmlpuppetcommunication/commands/changeauxiliarycommand.h
index a9264e606f..a9264e606f 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/changeauxiliarycommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp b/src/libs/qmlpuppetcommunication/commands/changebindingscommand.cpp
index b32456e70c..b32456e70c 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/changebindingscommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h b/src/libs/qmlpuppetcommunication/commands/changebindingscommand.h
index 215e143b6f..215e143b6f 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/changebindingscommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.cpp b/src/libs/qmlpuppetcommunication/commands/changefileurlcommand.cpp
index caada4abfb..caada4abfb 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/changefileurlcommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.h b/src/libs/qmlpuppetcommunication/commands/changefileurlcommand.h
index aed7769d8e..aed7769d8e 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/changefileurlcommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp b/src/libs/qmlpuppetcommunication/commands/changeidscommand.cpp
index 6133ef3bb0..6133ef3bb0 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/changeidscommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h b/src/libs/qmlpuppetcommunication/commands/changeidscommand.h
index 77f6392e54..77f6392e54 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/changeidscommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changelanguagecommand.cpp b/src/libs/qmlpuppetcommunication/commands/changelanguagecommand.cpp
index 410db15222..410db15222 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changelanguagecommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/changelanguagecommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changelanguagecommand.h b/src/libs/qmlpuppetcommunication/commands/changelanguagecommand.h
index e706e3238a..e706e3238a 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changelanguagecommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/changelanguagecommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.cpp b/src/libs/qmlpuppetcommunication/commands/changenodesourcecommand.cpp
index 338de4507a..338de4507a 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/changenodesourcecommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h b/src/libs/qmlpuppetcommunication/commands/changenodesourcecommand.h
index c62e8d9bd6..c62e8d9bd6 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/changenodesourcecommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changepreviewimagesizecommand.cpp b/src/libs/qmlpuppetcommunication/commands/changepreviewimagesizecommand.cpp
index 00ce8506bd..00ce8506bd 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changepreviewimagesizecommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/changepreviewimagesizecommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changepreviewimagesizecommand.h b/src/libs/qmlpuppetcommunication/commands/changepreviewimagesizecommand.h
index b47cc9c067..b47cc9c067 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changepreviewimagesizecommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/changepreviewimagesizecommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changeselectioncommand.cpp b/src/libs/qmlpuppetcommunication/commands/changeselectioncommand.cpp
index c2f4576bd6..c2f4576bd6 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changeselectioncommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/changeselectioncommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changeselectioncommand.h b/src/libs/qmlpuppetcommunication/commands/changeselectioncommand.h
index f041dda430..f041dda430 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changeselectioncommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/changeselectioncommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.cpp b/src/libs/qmlpuppetcommunication/commands/changestatecommand.cpp
index 0f52f68750..0f52f68750 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/changestatecommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.h b/src/libs/qmlpuppetcommunication/commands/changestatecommand.h
index 1e76ee88e5..1e76ee88e5 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/changestatecommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.cpp b/src/libs/qmlpuppetcommunication/commands/changevaluescommand.cpp
index a55eea221e..a55eea221e 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/changevaluescommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.h b/src/libs/qmlpuppetcommunication/commands/changevaluescommand.h
index cab4effd47..cab4effd47 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/changevaluescommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.cpp b/src/libs/qmlpuppetcommunication/commands/childrenchangedcommand.cpp
index 58b22cdf9b..58b22cdf9b 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/childrenchangedcommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.h b/src/libs/qmlpuppetcommunication/commands/childrenchangedcommand.h
index fedcea393f..fedcea393f 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/childrenchangedcommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.cpp b/src/libs/qmlpuppetcommunication/commands/clearscenecommand.cpp
index cfc27ba6c5..cfc27ba6c5 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/clearscenecommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.h b/src/libs/qmlpuppetcommunication/commands/clearscenecommand.h
index 63374033ad..63374033ad 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/clearscenecommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.cpp b/src/libs/qmlpuppetcommunication/commands/completecomponentcommand.cpp
index 85d134f269..85d134f269 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/completecomponentcommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h b/src/libs/qmlpuppetcommunication/commands/completecomponentcommand.h
index 3da75408d6..3da75408d6 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/completecomponentcommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.cpp b/src/libs/qmlpuppetcommunication/commands/componentcompletedcommand.cpp
index 82bde65a51..82bde65a51 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/componentcompletedcommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h b/src/libs/qmlpuppetcommunication/commands/componentcompletedcommand.h
index 86c492fa3b..86c492fa3b 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/componentcompletedcommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.cpp b/src/libs/qmlpuppetcommunication/commands/createinstancescommand.cpp
index 81c761461c..81c761461c 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/createinstancescommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.h b/src/libs/qmlpuppetcommunication/commands/createinstancescommand.h
index aff5c87a5f..aff5c87a5f 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/createinstancescommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.cpp b/src/libs/qmlpuppetcommunication/commands/createscenecommand.cpp
index 18c35ff3e2..18c35ff3e2 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/createscenecommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h b/src/libs/qmlpuppetcommunication/commands/createscenecommand.h
index d2682e4253..d2682e4253 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/createscenecommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.cpp b/src/libs/qmlpuppetcommunication/commands/debugoutputcommand.cpp
index d247341dad..d247341dad 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/debugoutputcommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.h b/src/libs/qmlpuppetcommunication/commands/debugoutputcommand.h
index bcdde736bf..bcdde736bf 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/debugoutputcommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp b/src/libs/qmlpuppetcommunication/commands/endpuppetcommand.cpp
index 785130aa1b..785130aa1b 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/endpuppetcommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h b/src/libs/qmlpuppetcommunication/commands/endpuppetcommand.h
index 58cd1a1564..58cd1a1564 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/endpuppetcommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.cpp b/src/libs/qmlpuppetcommunication/commands/informationchangedcommand.cpp
index 0111466a31..0111466a31 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/informationchangedcommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h b/src/libs/qmlpuppetcommunication/commands/informationchangedcommand.h
index 348809a7ae..348809a7ae 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/informationchangedcommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/inputeventcommand.cpp b/src/libs/qmlpuppetcommunication/commands/inputeventcommand.cpp
index e2547ebce7..e2547ebce7 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/inputeventcommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/inputeventcommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/inputeventcommand.h b/src/libs/qmlpuppetcommunication/commands/inputeventcommand.h
index 163d8b9521..163d8b9521 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/inputeventcommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/inputeventcommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/nanotracecommand.cpp b/src/libs/qmlpuppetcommunication/commands/nanotracecommand.cpp
index 346b93dd66..346b93dd66 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/nanotracecommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/nanotracecommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/nanotracecommand.h b/src/libs/qmlpuppetcommunication/commands/nanotracecommand.h
index 57cd165f6e..57cd165f6e 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/nanotracecommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/nanotracecommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.cpp b/src/libs/qmlpuppetcommunication/commands/pixmapchangedcommand.cpp
index 16ce88d69b..16ce88d69b 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/pixmapchangedcommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.h b/src/libs/qmlpuppetcommunication/commands/pixmapchangedcommand.h
index 249bf8714f..249bf8714f 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/pixmapchangedcommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/puppetalivecommand.cpp b/src/libs/qmlpuppetcommunication/commands/puppetalivecommand.cpp
index 0af289f240..0af289f240 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/puppetalivecommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/puppetalivecommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/puppetalivecommand.h b/src/libs/qmlpuppetcommunication/commands/puppetalivecommand.h
index 93741252dc..93741252dc 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/puppetalivecommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/puppetalivecommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/puppettocreatorcommand.cpp b/src/libs/qmlpuppetcommunication/commands/puppettocreatorcommand.cpp
index 1eb49b66ad..1eb49b66ad 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/puppettocreatorcommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/puppettocreatorcommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/puppettocreatorcommand.h b/src/libs/qmlpuppetcommunication/commands/puppettocreatorcommand.h
index 762054bb9b..762054bb9b 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/puppettocreatorcommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/puppettocreatorcommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.cpp b/src/libs/qmlpuppetcommunication/commands/removeinstancescommand.cpp
index e47fa89654..e47fa89654 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/removeinstancescommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h b/src/libs/qmlpuppetcommunication/commands/removeinstancescommand.h
index f0d547486b..f0d547486b 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/removeinstancescommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.cpp b/src/libs/qmlpuppetcommunication/commands/removepropertiescommand.cpp
index 201d2241c9..201d2241c9 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/removepropertiescommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h b/src/libs/qmlpuppetcommunication/commands/removepropertiescommand.h
index f643e9b10b..f643e9b10b 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/removepropertiescommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.cpp b/src/libs/qmlpuppetcommunication/commands/removesharedmemorycommand.cpp
index 0c865747a9..0c865747a9 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/removesharedmemorycommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.h b/src/libs/qmlpuppetcommunication/commands/removesharedmemorycommand.h
index 2a8303dcb5..2a8303dcb5 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/removesharedmemorycommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.cpp b/src/libs/qmlpuppetcommunication/commands/reparentinstancescommand.cpp
index f681fb5ee2..f681fb5ee2 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/reparentinstancescommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h b/src/libs/qmlpuppetcommunication/commands/reparentinstancescommand.h
index f9f0a3458a..f9f0a3458a 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/reparentinstancescommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/requestmodelnodepreviewimagecommand.cpp b/src/libs/qmlpuppetcommunication/commands/requestmodelnodepreviewimagecommand.cpp
index 07099717b5..07099717b5 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/requestmodelnodepreviewimagecommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/requestmodelnodepreviewimagecommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/requestmodelnodepreviewimagecommand.h b/src/libs/qmlpuppetcommunication/commands/requestmodelnodepreviewimagecommand.h
index 41dac0d113..41dac0d113 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/requestmodelnodepreviewimagecommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/requestmodelnodepreviewimagecommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/scenecreatedcommand.h b/src/libs/qmlpuppetcommunication/commands/scenecreatedcommand.h
index 86ef8dddd9..86ef8dddd9 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/scenecreatedcommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/scenecreatedcommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.cpp b/src/libs/qmlpuppetcommunication/commands/statepreviewimagechangedcommand.cpp
index 1f7e628613..1f7e628613 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/statepreviewimagechangedcommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.h b/src/libs/qmlpuppetcommunication/commands/statepreviewimagechangedcommand.h
index f9179a23f9..f9179a23f9 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/statepreviewimagechangedcommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.h b/src/libs/qmlpuppetcommunication/commands/synchronizecommand.h
index a881d8077c..a881d8077c 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/synchronizecommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/tokencommand.cpp b/src/libs/qmlpuppetcommunication/commands/tokencommand.cpp
index 3832e1d1fd..3832e1d1fd 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/tokencommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/tokencommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h b/src/libs/qmlpuppetcommunication/commands/tokencommand.h
index 4294967cb2..4294967cb2 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/tokencommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/update3dviewstatecommand.cpp b/src/libs/qmlpuppetcommunication/commands/update3dviewstatecommand.cpp
index 83486a5195..83486a5195 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/update3dviewstatecommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/update3dviewstatecommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/update3dviewstatecommand.h b/src/libs/qmlpuppetcommunication/commands/update3dviewstatecommand.h
index e75763c58f..e75763c58f 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/update3dviewstatecommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/update3dviewstatecommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp b/src/libs/qmlpuppetcommunication/commands/valueschangedcommand.cpp
index 21de2a7919..21de2a7919 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/valueschangedcommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.h b/src/libs/qmlpuppetcommunication/commands/valueschangedcommand.h
index 36a36439dc..36a36439dc 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/valueschangedcommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/commands/view3dactioncommand.cpp b/src/libs/qmlpuppetcommunication/commands/view3dactioncommand.cpp
index ee3c7da797..ee3c7da797 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/view3dactioncommand.cpp
+++ b/src/libs/qmlpuppetcommunication/commands/view3dactioncommand.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/commands/view3dactioncommand.h b/src/libs/qmlpuppetcommunication/commands/view3dactioncommand.h
index 946ea02f6c..946ea02f6c 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/view3dactioncommand.h
+++ b/src/libs/qmlpuppetcommunication/commands/view3dactioncommand.h
diff --git a/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp b/src/libs/qmlpuppetcommunication/container/addimportcontainer.cpp
index eb36d656b0..eb36d656b0 100644
--- a/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp
+++ b/src/libs/qmlpuppetcommunication/container/addimportcontainer.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.h b/src/libs/qmlpuppetcommunication/container/addimportcontainer.h
index fadfbab44e..fadfbab44e 100644
--- a/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.h
+++ b/src/libs/qmlpuppetcommunication/container/addimportcontainer.h
diff --git a/share/qtcreator/qml/qmlpuppet/container/idcontainer.cpp b/src/libs/qmlpuppetcommunication/container/idcontainer.cpp
index f28c9e91e9..f28c9e91e9 100644
--- a/share/qtcreator/qml/qmlpuppet/container/idcontainer.cpp
+++ b/src/libs/qmlpuppetcommunication/container/idcontainer.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/container/idcontainer.h b/src/libs/qmlpuppetcommunication/container/idcontainer.h
index c9fade64c7..c9fade64c7 100644
--- a/share/qtcreator/qml/qmlpuppet/container/idcontainer.h
+++ b/src/libs/qmlpuppetcommunication/container/idcontainer.h
diff --git a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp b/src/libs/qmlpuppetcommunication/container/imagecontainer.cpp
index d71ba4769e..d71ba4769e 100644
--- a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp
+++ b/src/libs/qmlpuppetcommunication/container/imagecontainer.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.h b/src/libs/qmlpuppetcommunication/container/imagecontainer.h
index c6c101ca8c..c6c101ca8c 100644
--- a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.h
+++ b/src/libs/qmlpuppetcommunication/container/imagecontainer.h
diff --git a/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp b/src/libs/qmlpuppetcommunication/container/informationcontainer.cpp
index 7a51877719..7a51877719 100644
--- a/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp
+++ b/src/libs/qmlpuppetcommunication/container/informationcontainer.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/container/informationcontainer.h b/src/libs/qmlpuppetcommunication/container/informationcontainer.h
index 93c06560d2..93c06560d2 100644
--- a/share/qtcreator/qml/qmlpuppet/container/informationcontainer.h
+++ b/src/libs/qmlpuppetcommunication/container/informationcontainer.h
diff --git a/share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp b/src/libs/qmlpuppetcommunication/container/instancecontainer.cpp
index 5e5c688cc6..5e5c688cc6 100644
--- a/share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp
+++ b/src/libs/qmlpuppetcommunication/container/instancecontainer.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h b/src/libs/qmlpuppetcommunication/container/instancecontainer.h
index 4d0218f248..4d0218f248 100644
--- a/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h
+++ b/src/libs/qmlpuppetcommunication/container/instancecontainer.h
diff --git a/share/qtcreator/qml/qmlpuppet/container/mockuptypecontainer.cpp b/src/libs/qmlpuppetcommunication/container/mockuptypecontainer.cpp
index b4e7218f79..b4e7218f79 100644
--- a/share/qtcreator/qml/qmlpuppet/container/mockuptypecontainer.cpp
+++ b/src/libs/qmlpuppetcommunication/container/mockuptypecontainer.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/container/mockuptypecontainer.h b/src/libs/qmlpuppetcommunication/container/mockuptypecontainer.h
index 8294b8a845..8294b8a845 100644
--- a/share/qtcreator/qml/qmlpuppet/container/mockuptypecontainer.h
+++ b/src/libs/qmlpuppetcommunication/container/mockuptypecontainer.h
diff --git a/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.cpp b/src/libs/qmlpuppetcommunication/container/propertyabstractcontainer.cpp
index 1879bd0a0e..1879bd0a0e 100644
--- a/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.cpp
+++ b/src/libs/qmlpuppetcommunication/container/propertyabstractcontainer.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h b/src/libs/qmlpuppetcommunication/container/propertyabstractcontainer.h
index e0f62e1937..e0f62e1937 100644
--- a/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h
+++ b/src/libs/qmlpuppetcommunication/container/propertyabstractcontainer.h
diff --git a/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.cpp b/src/libs/qmlpuppetcommunication/container/propertybindingcontainer.cpp
index ecb498f260..ecb498f260 100644
--- a/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.cpp
+++ b/src/libs/qmlpuppetcommunication/container/propertybindingcontainer.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.h b/src/libs/qmlpuppetcommunication/container/propertybindingcontainer.h
index 11e4afc8f9..11e4afc8f9 100644
--- a/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.h
+++ b/src/libs/qmlpuppetcommunication/container/propertybindingcontainer.h
diff --git a/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.cpp b/src/libs/qmlpuppetcommunication/container/propertyvaluecontainer.cpp
index 160267a21d..160267a21d 100644
--- a/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.cpp
+++ b/src/libs/qmlpuppetcommunication/container/propertyvaluecontainer.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.h b/src/libs/qmlpuppetcommunication/container/propertyvaluecontainer.h
index c9d03ad9e8..c9d03ad9e8 100644
--- a/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.h
+++ b/src/libs/qmlpuppetcommunication/container/propertyvaluecontainer.h
diff --git a/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.cpp b/src/libs/qmlpuppetcommunication/container/reparentcontainer.cpp
index 77206f1f9a..77206f1f9a 100644
--- a/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.cpp
+++ b/src/libs/qmlpuppetcommunication/container/reparentcontainer.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h b/src/libs/qmlpuppetcommunication/container/reparentcontainer.h
index e49f973fb9..e49f973fb9 100644
--- a/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
+++ b/src/libs/qmlpuppetcommunication/container/reparentcontainer.h
diff --git a/share/qtcreator/qml/qmlpuppet/container/sharedmemory.h b/src/libs/qmlpuppetcommunication/container/sharedmemory.h
index 1c5da3454a..1c5da3454a 100644
--- a/share/qtcreator/qml/qmlpuppet/container/sharedmemory.h
+++ b/src/libs/qmlpuppetcommunication/container/sharedmemory.h
diff --git a/share/qtcreator/qml/qmlpuppet/container/sharedmemory_qt.cpp b/src/libs/qmlpuppetcommunication/container/sharedmemory_qt.cpp
index 4165e86517..4165e86517 100644
--- a/share/qtcreator/qml/qmlpuppet/container/sharedmemory_qt.cpp
+++ b/src/libs/qmlpuppetcommunication/container/sharedmemory_qt.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp b/src/libs/qmlpuppetcommunication/container/sharedmemory_unix.cpp
index 317aa646b1..317aa646b1 100644
--- a/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp
+++ b/src/libs/qmlpuppetcommunication/container/sharedmemory_unix.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h b/src/libs/qmlpuppetcommunication/interfaces/commondefines.h
index 7909c097b0..7909c097b0 100644
--- a/share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h
+++ b/src/libs/qmlpuppetcommunication/interfaces/commondefines.h
diff --git a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h b/src/libs/qmlpuppetcommunication/interfaces/nodeinstanceclientinterface.h
index 01d2ac8a2e..01d2ac8a2e 100644
--- a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h
+++ b/src/libs/qmlpuppetcommunication/interfaces/nodeinstanceclientinterface.h
diff --git a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceglobal.h b/src/libs/qmlpuppetcommunication/interfaces/nodeinstanceglobal.h
index 968a9bef0f..968a9bef0f 100644
--- a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceglobal.h
+++ b/src/libs/qmlpuppetcommunication/interfaces/nodeinstanceglobal.h
diff --git a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp b/src/libs/qmlpuppetcommunication/interfaces/nodeinstanceserverinterface.cpp
index 110db56527..110db56527 100644
--- a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp
+++ b/src/libs/qmlpuppetcommunication/interfaces/nodeinstanceserverinterface.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h b/src/libs/qmlpuppetcommunication/interfaces/nodeinstanceserverinterface.h
index 94e35176fd..94e35176fd 100644
--- a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h
+++ b/src/libs/qmlpuppetcommunication/interfaces/nodeinstanceserverinterface.h
diff --git a/share/qtcreator/qml/qmlpuppet/types/enumeration.h b/src/libs/qmlpuppetcommunication/types/enumeration.h
index 85d353d80d..85d353d80d 100644
--- a/share/qtcreator/qml/qmlpuppet/types/enumeration.h
+++ b/src/libs/qmlpuppetcommunication/types/enumeration.h
diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt
index 279bcbf4c6..e106f82808 100644
--- a/src/plugins/qmldesigner/CMakeLists.txt
+++ b/src/plugins/qmldesigner/CMakeLists.txt
@@ -42,6 +42,7 @@ add_qtc_library(QmlDesignerCore STATIC
     QmlProjectManager
     QtSupport
   PUBLIC_DEPENDS
+    QmlPuppetCommunication
     QmlDesignerUtils
     TextEditor
     Sqlite
@@ -350,118 +351,6 @@ extend_qtc_library(QmlDesignerCore
 )
 
 extend_qtc_library(QmlDesignerCore
-  SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/../../../share/qtcreator/qml/qmlpuppet
-  INCLUDES
-    ${CMAKE_CURRENT_LIST_DIR}/../../../share/qtcreator/qml/qmlpuppet/commands
-    ${CMAKE_CURRENT_LIST_DIR}/../../../share/qtcreator/qml/qmlpuppet/container
-  PUBLIC_INCLUDES
-    "${CMAKE_CURRENT_LIST_DIR}/../../../share/qtcreator/qml/qmlpuppet/interfaces"
-    "${CMAKE_CURRENT_LIST_DIR}/../../../share/qtcreator/qml/qmlpuppet/types"
-  SOURCES
-    commands/captureddatacommand.h
-    commands/changeauxiliarycommand.cpp
-    commands/changeauxiliarycommand.h
-    commands/changebindingscommand.cpp
-    commands/changebindingscommand.h
-    commands/changefileurlcommand.cpp
-    commands/changefileurlcommand.h
-    commands/changeidscommand.cpp
-    commands/changeidscommand.h
-    commands/changelanguagecommand.cpp
-    commands/changelanguagecommand.h
-    commands/changenodesourcecommand.cpp
-    commands/changenodesourcecommand.h
-    commands/changepreviewimagesizecommand.cpp
-    commands/changepreviewimagesizecommand.h
-    commands/changeselectioncommand.cpp
-    commands/changeselectioncommand.h
-    commands/changestatecommand.cpp
-    commands/changestatecommand.h
-    commands/changevaluescommand.cpp
-    commands/changevaluescommand.h
-    commands/childrenchangedcommand.cpp
-    commands/childrenchangedcommand.h
-    commands/clearscenecommand.cpp
-    commands/clearscenecommand.h
-    commands/completecomponentcommand.cpp
-    commands/completecomponentcommand.h
-    commands/componentcompletedcommand.cpp
-    commands/componentcompletedcommand.h
-    commands/createinstancescommand.cpp
-    commands/createinstancescommand.h
-    commands/createscenecommand.cpp
-    commands/createscenecommand.h
-    commands/debugoutputcommand.cpp
-    commands/debugoutputcommand.h
-    commands/endpuppetcommand.cpp
-    commands/endpuppetcommand.h
-    commands/informationchangedcommand.cpp
-    commands/informationchangedcommand.h
-    commands/nanotracecommand.cpp
-    commands/nanotracecommand.h
-    commands/inputeventcommand.cpp
-    commands/inputeventcommand.h
-    commands/pixmapchangedcommand.cpp
-    commands/pixmapchangedcommand.h
-    commands/puppetalivecommand.cpp
-    commands/puppetalivecommand.h
-    commands/puppettocreatorcommand.cpp
-    commands/puppettocreatorcommand.h
-    commands/removeinstancescommand.cpp
-    commands/removeinstancescommand.h
-    commands/removepropertiescommand.cpp
-    commands/removepropertiescommand.h
-    commands/removesharedmemorycommand.cpp
-    commands/removesharedmemorycommand.h
-    commands/reparentinstancescommand.cpp
-    commands/reparentinstancescommand.h
-    commands/requestmodelnodepreviewimagecommand.cpp
-    commands/requestmodelnodepreviewimagecommand.h
-    commands/scenecreatedcommand.h
-    commands/statepreviewimagechangedcommand.cpp
-    commands/statepreviewimagechangedcommand.h
-    commands/synchronizecommand.h
-    commands/tokencommand.cpp
-    commands/tokencommand.h
-    commands/update3dviewstatecommand.cpp
-    commands/update3dviewstatecommand.h
-    commands/valueschangedcommand.cpp
-    commands/valueschangedcommand.h
-    commands/view3dactioncommand.cpp
-    commands/view3dactioncommand.h
-
-    container/addimportcontainer.cpp
-    container/addimportcontainer.h
-    container/idcontainer.cpp
-    container/idcontainer.h
-    container/imagecontainer.cpp
-    container/imagecontainer.h
-    container/informationcontainer.cpp
-    container/informationcontainer.h
-    container/instancecontainer.cpp
-    container/instancecontainer.h
-    container/mockuptypecontainer.cpp
-    container/mockuptypecontainer.h
-    container/propertyabstractcontainer.cpp
-    container/propertyabstractcontainer.h
-    container/propertybindingcontainer.cpp
-    container/propertybindingcontainer.h
-    container/propertyvaluecontainer.cpp
-    container/propertyvaluecontainer.h
-    container/reparentcontainer.cpp
-    container/reparentcontainer.h
-    container/sharedmemory.h
-
-    interfaces/commondefines.h
-    interfaces/nodeinstanceclientinterface.h
-    interfaces/nodeinstanceglobal.h
-    interfaces/nodeinstanceserverinterface.cpp
-    interfaces/nodeinstanceserverinterface.h
-
-    types/enumeration.h
-)
-
-extend_qtc_library(QmlDesignerCore
   SOURCES_PREFIX designercore/projectstorage
   PUBLIC_INCLUDES designercore/projectstorage
   SOURCES
@@ -498,18 +387,6 @@ extend_qtc_library(QmlDesignerCore
     qmldocumentparser.cpp qmldocumentparser.h
 )
 
-extend_qtc_library(QmlDesignerCore
-  CONDITION UNIX
-  SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/../../../share/qtcreator/qml/qmlpuppet/container
-  SOURCES sharedmemory_unix.cpp
-)
-
-extend_qtc_library(QmlDesignerCore
-  CONDITION NOT UNIX
-  SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/../../../share/qtcreator/qml/qmlpuppet/container
-  SOURCES sharedmemory_qt.cpp
-)
-
 file(GLOB PROJECTSTORAGE_EXCLUDED_SOURCES designercore/projectstorage/*.cpp)
 set_property(SOURCE ${PROJECTSTORAGE_EXCLUDED_SOURCES} PROPERTY SKIP_AUTOMOC ON)
 
diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt
index f615e7322a..7ef09420ee 100644
--- a/src/tools/qml2puppet/CMakeLists.txt
+++ b/src/tools/qml2puppet/CMakeLists.txt
@@ -1,136 +1,60 @@
-set(SRCDIR "${PROJECT_SOURCE_DIR}/share/qtcreator/qml/qmlpuppet")
+cmake_minimum_required(VERSION 3.16)
 
-set(DESTDIR "${IDE_LIBEXEC_PATH}")
-if (APPLE)
-  string(APPEND DESTDIR "/qmldesigner")
-endif()
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake")
 
-add_qtc_library(qml2puppet_static
-  STATIC
-  DEPENDS
-  Qt5::CorePrivate Qt5::Widgets
-  PUBLIC_INCLUDES "${SRCDIR}/interfaces"
-  SOURCES_PREFIX "${SRCDIR}/interfaces"
-  SOURCES
-    commondefines.h
-    nodeinstanceclientinterface.h
-    nodeinstanceglobal.h
-    nodeinstanceserverinterface.cpp nodeinstanceserverinterface.h
-)
 
-extend_qtc_library(qml2puppet_static
-  PUBLIC_INCLUDES "${SRCDIR}/types"
-  SOURCES "${SRCDIR}/types/enumeration.h"
-)
+project(qml2puppet)
 
-extend_qtc_library(qml2puppet_static
-  PUBLIC_INCLUDES "${SRCDIR}/container"
-  SOURCES_PREFIX "${SRCDIR}/container"
-  SOURCES
-    addimportcontainer.cpp addimportcontainer.h
-    idcontainer.cpp idcontainer.h
-    imagecontainer.cpp imagecontainer.h
-    informationcontainer.cpp informationcontainer.h
-    instancecontainer.cpp instancecontainer.h
-    mockuptypecontainer.cpp mockuptypecontainer.h
-    propertyabstractcontainer.cpp propertyabstractcontainer.h
-    propertybindingcontainer.cpp propertybindingcontainer.h
-    propertyvaluecontainer.cpp propertyvaluecontainer.h
-    reparentcontainer.cpp reparentcontainer.h
-    sharedmemory.h
-)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
-extend_qtc_library(qml2puppet_static
-  CONDITION UNIX
-  SOURCES_PREFIX "${SRCDIR}/container"
-  SOURCES
-    sharedmemory_unix.cpp
-)
+if (NOT QT_CREATOR_API_DEFINED)
+  # standalone build
+  set(DESTINATION DESTINATION $ENV{QDS_PUPPET_DESTINATION})
+  include(QtCreatorIDEBranding)
+  include(QtCreatorAPI)
+endif()
 
-extend_qtc_library(qml2puppet_static
-  CONDITION NOT UNIX
-  SOURCES_PREFIX "${SRCDIR}/container"
-  SOURCES
-    sharedmemory_qt.cpp
+find_package(Qt5
+  COMPONENTS Concurrent Core Gui Network PrintSupport Qml Quick Sql Widgets Xml Core5Compat
+  REQUIRED
 )
 
-extend_qtc_library(qml2puppet_static
-  PUBLIC_INCLUDES "${SRCDIR}/commands"
-  SOURCES_PREFIX "${SRCDIR}/commands"
-  SOURCES
-    changeauxiliarycommand.cpp changeauxiliarycommand.h
-    changebindingscommand.cpp changebindingscommand.h
-    changefileurlcommand.cpp changefileurlcommand.h
-    changeidscommand.cpp changeidscommand.h
-    changenodesourcecommand.cpp changenodesourcecommand.h
-    changestatecommand.cpp changestatecommand.h
-    changevaluescommand.cpp changevaluescommand.h
-    childrenchangedcommand.cpp childrenchangedcommand.h
-    clearscenecommand.cpp clearscenecommand.h
-    completecomponentcommand.cpp completecomponentcommand.h
-    componentcompletedcommand.cpp componentcompletedcommand.h
-    createinstancescommand.cpp createinstancescommand.h
-    createscenecommand.cpp createscenecommand.h
-    changepreviewimagesizecommand.cpp changepreviewimagesizecommand.h
-    changelanguagecommand.cpp changelanguagecommand.h
-    debugoutputcommand.cpp debugoutputcommand.h
-    endpuppetcommand.cpp endpuppetcommand.h
-    informationchangedcommand.cpp informationchangedcommand.h
-    nanotracecommand.cpp nanotracecommand.h
-    pixmapchangedcommand.cpp pixmapchangedcommand.h
-    puppetalivecommand.cpp puppetalivecommand.h
-    removeinstancescommand.cpp removeinstancescommand.h
-    removepropertiescommand.cpp removepropertiescommand.h
-    removesharedmemorycommand.cpp removesharedmemorycommand.h
-    reparentinstancescommand.cpp reparentinstancescommand.h
-    statepreviewimagechangedcommand.cpp statepreviewimagechangedcommand.h
-    synchronizecommand.h
-    tokencommand.cpp tokencommand.h
-    changeselectioncommand.cpp changeselectioncommand.h
-    update3dviewstatecommand.cpp update3dviewstatecommand.h
-    puppettocreatorcommand.cpp puppettocreatorcommand.h
-    inputeventcommand.cpp inputeventcommand.h
-    view3dactioncommand.cpp view3dactioncommand.h
-    requestmodelnodepreviewimagecommand.cpp requestmodelnodepreviewimagecommand.h
-    valueschangedcommand.cpp
-    captureddatacommand.h
-    scenecreatedcommand.h
-)
-
-extend_qtc_library(qml2puppet_static
-  PUBLIC_INCLUDES "${PROJECT_SOURCE_DIR}/src/libs"
-)
-extend_qtc_library(qml2puppet_static
-  CONDITION TARGET Nanotrace
-  DEPENDS Nanotrace
-)
+if (NOT TARGET QmlPuppetCommunication)
+include(../../libs/qmlpuppetcommunication/QmlPuppetCommunication.cmake)
+endif()
 
 add_qtc_executable(qml2puppet
-  CONDITION TARGET Qt5::QuickPrivate
+  ${DESTINATION}
   DEPENDS
     Qt5::CorePrivate Qt5::Widgets Qt5::QmlPrivate
     Qt5::QuickPrivate Qt5::Network Qt5::GuiPrivate
-    qml2puppet_static
+    QmlPuppetCommunication
   SOURCES
-    "${SRCDIR}/qml2puppet/qml2puppetmain.cpp"
-    "${SRCDIR}/qmlpuppet.qrc"
-  DESTINATION ${DESTDIR}
+    qml2puppet/qml2puppetmain.cpp
+    qmlpuppet.qrc
 )
 
-set_target_properties(qml2puppet PROPERTIES OUTPUT_NAME qml2puppet-${IDE_VERSION})
+if (NOT "$ENV{QDS_PUPPET_VERSION}" STREQUAL "")
+  set_target_properties(qml2puppet PROPERTIES OUTPUT_NAME qml2puppet-$ENV{QDS_PUPPET_VERSION})
+else()
+  set_target_properties(qml2puppet PROPERTIES OUTPUT_NAME qml2puppet-${IDE_VERSION})
+endif()
 
 extend_qtc_executable(qml2puppet
   CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.0.0
-  SOURCES_PREFIX "${SRCDIR}/"
   SOURCES
-    "editor3d_qt6.qrc"
+    editor3d_qt6.qrc
 )
 
 extend_qtc_executable(qml2puppet
   CONDITION Qt5_VERSION VERSION_LESS 6.0.0
-  SOURCES_PREFIX "${SRCDIR}/"
   SOURCES
-    "editor3d_qt5.qrc"
+    editor3d_qt5.qrc
 )
 
 extend_qtc_executable(qml2puppet
@@ -139,7 +63,7 @@ extend_qtc_executable(qml2puppet
 )
 
 extend_qtc_executable(qml2puppet
-  SOURCES_PREFIX "${SRCDIR}/instances"
+  SOURCES_PREFIX instances
   SOURCES
     nodeinstanceclientproxy.cpp nodeinstanceclientproxy.h
 )
@@ -151,7 +75,7 @@ extend_qtc_executable(qml2puppet
   DEPENDS Qt5::Quick3D Qt5::Quick3DPrivate
   DEFINES QUICK3D_MODULE
 
-  SOURCES_PREFIX "${SRCDIR}/qml2puppet/editor3d"
+  SOURCES_PREFIX qml2puppet/editor3d
   SOURCES
     generalhelper.cpp generalhelper.h
     mousearea3d.cpp mousearea3d.h
@@ -191,26 +115,25 @@ extend_qtc_executable(qml2puppet
 
 extend_qtc_executable(qml2puppet
   CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.0.0
-
-  SOURCES_PREFIX "${SRCDIR}/qml2puppet/editor3d/qt5compat"
+  SOURCES_PREFIX qml2puppet/editor3d/qt5compat
   SOURCES
     qquick3darealight.cpp qquick3darealight_p.h
 )
 
 extend_qtc_executable(qml2puppet
-  SOURCES_PREFIX "${SRCDIR}/qml2puppet/iconrenderer"
+  SOURCES_PREFIX qml2puppet/iconrenderer
   SOURCES
     iconrenderer.cpp iconrenderer.h
 )
 
 extend_qtc_executable(qml2puppet
-  SOURCES_PREFIX "${SRCDIR}/qml2puppet/import3d"
+  SOURCES_PREFIX qml2puppet/import3d
   SOURCES
     import3d.cpp import3d.h
 )
 
 extend_qtc_executable(qml2puppet
-  SOURCES_PREFIX "${SRCDIR}/qml2puppet/instances"
+  SOURCES_PREFIX qml2puppet/instances
   SOURCES
     anchorchangesnodeinstance.cpp anchorchangesnodeinstance.h
     behaviornodeinstance.cpp behaviornodeinstance.h
@@ -248,13 +171,7 @@ extend_qtc_executable(qml2puppet
 )
 
 extend_qtc_executable(qml2puppet
-  SOURCES_PREFIX "${SRCDIR}/types"
-  SOURCES
-    enumeration.h
-)
-
-extend_qtc_executable(qml2puppet
-  SOURCES_PREFIX "${SRCDIR}/qmlprivategate"
+  SOURCES_PREFIX qmlprivategate
   SOURCES
     qmlprivategate.cpp qmlprivategate.h
 )
@@ -270,7 +187,7 @@ extend_qtc_executable(qml2puppet
 )
 
 extend_qtc_executable(qml2puppet
-  PUBLIC_INCLUDES "${PROJECT_SOURCE_DIR}/src/libs"
+  PUBLIC_INCLUDES src/libs
 )
 
 extend_qtc_executable(qml2puppet
diff --git a/share/qtcreator/qml/qmlpuppet/editor3d_qt5.qrc b/src/tools/qml2puppet/editor3d_qt5.qrc
index d4127574a6..d4127574a6 100644
--- a/share/qtcreator/qml/qmlpuppet/editor3d_qt5.qrc
+++ b/src/tools/qml2puppet/editor3d_qt5.qrc
diff --git a/share/qtcreator/qml/qmlpuppet/editor3d_qt6.qrc b/src/tools/qml2puppet/editor3d_qt6.qrc
index bb29d683a0..bb29d683a0 100644
--- a/share/qtcreator/qml/qmlpuppet/editor3d_qt6.qrc
+++ b/src/tools/qml2puppet/editor3d_qt6.qrc
diff --git a/share/qtcreator/qml/qmlpuppet/html/welcome.html b/src/tools/qml2puppet/html/welcome.html
index bde0a094e2..bde0a094e2 100644
--- a/share/qtcreator/qml/qmlpuppet/html/welcome.html
+++ b/src/tools/qml2puppet/html/welcome.html
diff --git a/share/qtcreator/qml/qmlpuppet/images/non-visual-component.png b/src/tools/qml2puppet/images/non-visual-component.png
index f66e2b8b11..f66e2b8b11 100644
--- a/share/qtcreator/qml/qmlpuppet/images/non-visual-component.png
+++ b/src/tools/qml2puppet/images/non-visual-component.png
diff --git a/share/qtcreator/qml/qmlpuppet/images/non-visual-component@2x.png b/src/tools/qml2puppet/images/non-visual-component@2x.png
index 25a136ff25..25a136ff25 100644
--- a/share/qtcreator/qml/qmlpuppet/images/non-visual-component@2x.png
+++ b/src/tools/qml2puppet/images/non-visual-component@2x.png
diff --git a/share/qtcreator/qml/qmlpuppet/images/template_image.png b/src/tools/qml2puppet/images/template_image.png
index 96e7e63796..96e7e63796 100644
--- a/share/qtcreator/qml/qmlpuppet/images/template_image.png
+++ b/src/tools/qml2puppet/images/template_image.png
diff --git a/share/qtcreator/qml/qmlpuppet/images/webkit.png b/src/tools/qml2puppet/images/webkit.png
index cf6d7f1c19..cf6d7f1c19 100644
--- a/share/qtcreator/qml/qmlpuppet/images/webkit.png
+++ b/src/tools/qml2puppet/images/webkit.png
diff --git a/share/qtcreator/qml/qmlpuppet/instances/instances.pri b/src/tools/qml2puppet/instances/instances.pri
index daf1d3ed51..daf1d3ed51 100644
--- a/share/qtcreator/qml/qmlpuppet/instances/instances.pri
+++ b/src/tools/qml2puppet/instances/instances.pri
diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp b/src/tools/qml2puppet/instances/nodeinstanceclientproxy.cpp
index 0e349f7b86..0e349f7b86 100644
--- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp
+++ b/src/tools/qml2puppet/instances/nodeinstanceclientproxy.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h b/src/tools/qml2puppet/instances/nodeinstanceclientproxy.h
index 046117887e..046117887e 100644
--- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h
+++ b/src/tools/qml2puppet/instances/nodeinstanceclientproxy.h
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/Dialog.qml b/src/tools/qml2puppet/mockfiles/Dialog.qml
index e6a3ced517..e6a3ced517 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/Dialog.qml
+++ b/src/tools/qml2puppet/mockfiles/Dialog.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/GenericBackend.qml b/src/tools/qml2puppet/mockfiles/GenericBackend.qml
index 30083c228f..30083c228f 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/GenericBackend.qml
+++ b/src/tools/qml2puppet/mockfiles/GenericBackend.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/SwipeView.qml b/src/tools/qml2puppet/mockfiles/SwipeView.qml
index 751cdf2683..751cdf2683 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/SwipeView.qml
+++ b/src/tools/qml2puppet/mockfiles/SwipeView.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/ToggleButton.qml b/src/tools/qml2puppet/mockfiles/ToggleButton.qml
index 3c042b0e98..3c042b0e98 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/ToggleButton.qml
+++ b/src/tools/qml2puppet/mockfiles/ToggleButton.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/ToolBarButton.qml b/src/tools/qml2puppet/mockfiles/ToolBarButton.qml
index c149c10b47..c149c10b47 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/ToolBarButton.qml
+++ b/src/tools/qml2puppet/mockfiles/ToolBarButton.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml b/src/tools/qml2puppet/mockfiles/Window.qml
index 7dd8610499..7dd8610499 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml
+++ b/src/tools/qml2puppet/mockfiles/Window.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/area.png b/src/tools/qml2puppet/mockfiles/images/area.png
index ed261ff2d5..ed261ff2d5 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/area.png
+++ b/src/tools/qml2puppet/mockfiles/images/area.png
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/area@2x.png b/src/tools/qml2puppet/mockfiles/images/area@2x.png
index 1f6e37d7e9..1f6e37d7e9 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/area@2x.png
+++ b/src/tools/qml2puppet/mockfiles/images/area@2x.png
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/directional.png b/src/tools/qml2puppet/mockfiles/images/directional.png
index 289597156c..289597156c 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/directional.png
+++ b/src/tools/qml2puppet/mockfiles/images/directional.png
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/directional@2x.png b/src/tools/qml2puppet/mockfiles/images/directional@2x.png
index 7c3fa8557d..7c3fa8557d 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/directional@2x.png
+++ b/src/tools/qml2puppet/mockfiles/images/directional@2x.png
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/editor_camera.png b/src/tools/qml2puppet/mockfiles/images/editor_camera.png
index 4b2bf93d41..4b2bf93d41 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/editor_camera.png
+++ b/src/tools/qml2puppet/mockfiles/images/editor_camera.png
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/editor_camera@2x.png b/src/tools/qml2puppet/mockfiles/images/editor_camera@2x.png
index 1c690433c2..1c690433c2 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/editor_camera@2x.png
+++ b/src/tools/qml2puppet/mockfiles/images/editor_camera@2x.png
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/editor_particlesystem.png b/src/tools/qml2puppet/mockfiles/images/editor_particlesystem.png
index 55d35bc584..55d35bc584 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/editor_particlesystem.png
+++ b/src/tools/qml2puppet/mockfiles/images/editor_particlesystem.png
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/editor_particlesystem@2x.png b/src/tools/qml2puppet/mockfiles/images/editor_particlesystem@2x.png
index e66db81479..e66db81479 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/editor_particlesystem@2x.png
+++ b/src/tools/qml2puppet/mockfiles/images/editor_particlesystem@2x.png
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/floor_tex.png b/src/tools/qml2puppet/mockfiles/images/floor_tex.png
index d8550f8044..d8550f8044 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/floor_tex.png
+++ b/src/tools/qml2puppet/mockfiles/images/floor_tex.png
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/point.png b/src/tools/qml2puppet/mockfiles/images/point.png
index ba62ebdfb8..ba62ebdfb8 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/point.png
+++ b/src/tools/qml2puppet/mockfiles/images/point.png
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/point@2x.png b/src/tools/qml2puppet/mockfiles/images/point@2x.png
index 3e53bab0bd..3e53bab0bd 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/point@2x.png
+++ b/src/tools/qml2puppet/mockfiles/images/point@2x.png
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/preview_landscape.hdr b/src/tools/qml2puppet/mockfiles/images/preview_landscape.hdr
index 2c6b4372d4..2c6b4372d4 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/preview_landscape.hdr
+++ b/src/tools/qml2puppet/mockfiles/images/preview_landscape.hdr
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/preview_studio.hdr b/src/tools/qml2puppet/mockfiles/images/preview_studio.hdr
index 8ab060c1f4..8ab060c1f4 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/preview_studio.hdr
+++ b/src/tools/qml2puppet/mockfiles/images/preview_studio.hdr
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/spot.png b/src/tools/qml2puppet/mockfiles/images/spot.png
index e2f7371b85..e2f7371b85 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/spot.png
+++ b/src/tools/qml2puppet/mockfiles/images/spot.png
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/spot@2x.png b/src/tools/qml2puppet/mockfiles/images/spot@2x.png
index c8a7dba200..c8a7dba200 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/spot@2x.png
+++ b/src/tools/qml2puppet/mockfiles/images/spot@2x.png
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/images/static_floor.png b/src/tools/qml2puppet/mockfiles/images/static_floor.png
index 93073719f5..93073719f5 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/images/static_floor.png
+++ b/src/tools/qml2puppet/mockfiles/images/static_floor.png
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/meshes/arrow.mesh b/src/tools/qml2puppet/mockfiles/meshes/arrow.mesh
index be5f4df3b8..be5f4df3b8 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/meshes/arrow.mesh
+++ b/src/tools/qml2puppet/mockfiles/meshes/arrow.mesh
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/meshes/axishelper.mesh b/src/tools/qml2puppet/mockfiles/meshes/axishelper.mesh
index 3e9e4958e4..3e9e4958e4 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/meshes/axishelper.mesh
+++ b/src/tools/qml2puppet/mockfiles/meshes/axishelper.mesh
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/meshes/ring.mesh b/src/tools/qml2puppet/mockfiles/meshes/ring.mesh
index 56e1b82f29..56e1b82f29 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/meshes/ring.mesh
+++ b/src/tools/qml2puppet/mockfiles/meshes/ring.mesh
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/meshes/ringselect.mesh b/src/tools/qml2puppet/mockfiles/meshes/ringselect.mesh
index b110b308f0..b110b308f0 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/meshes/ringselect.mesh
+++ b/src/tools/qml2puppet/mockfiles/meshes/ringselect.mesh
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/meshes/scalerod.mesh b/src/tools/qml2puppet/mockfiles/meshes/scalerod.mesh
index b3c1bd883f..b3c1bd883f 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/meshes/scalerod.mesh
+++ b/src/tools/qml2puppet/mockfiles/meshes/scalerod.mesh
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/AdjustableArrow.qml b/src/tools/qml2puppet/mockfiles/qt5/AdjustableArrow.qml
index 2b0da44784..2b0da44784 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/AdjustableArrow.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/AdjustableArrow.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/AreaLightHandle.qml b/src/tools/qml2puppet/mockfiles/qt5/AreaLightHandle.qml
index b3b0dbbc8c..b3b0dbbc8c 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/AreaLightHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/AreaLightHandle.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/Arrow.qml b/src/tools/qml2puppet/mockfiles/qt5/Arrow.qml
index 98d3abe112..98d3abe112 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/Arrow.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/Arrow.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/AutoScaleHelper.qml b/src/tools/qml2puppet/mockfiles/qt5/AutoScaleHelper.qml
index 9f33abaddd..9f33abaddd 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/AutoScaleHelper.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/AutoScaleHelper.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/AxisHelper.qml b/src/tools/qml2puppet/mockfiles/qt5/AxisHelper.qml
index de45ff39f5..de45ff39f5 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/AxisHelper.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/AxisHelper.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/AxisHelperArm.qml b/src/tools/qml2puppet/mockfiles/qt5/AxisHelperArm.qml
index 9385c9e736..9385c9e736 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/AxisHelperArm.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/AxisHelperArm.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/CameraFrustum.qml b/src/tools/qml2puppet/mockfiles/qt5/CameraFrustum.qml
index ad581417cb..ad581417cb 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/CameraFrustum.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/CameraFrustum.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/CameraGizmo.qml b/src/tools/qml2puppet/mockfiles/qt5/CameraGizmo.qml
index b1cdbcd89a..b1cdbcd89a 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/CameraGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/CameraGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/DirectionalDraggable.qml b/src/tools/qml2puppet/mockfiles/qt5/DirectionalDraggable.qml
index a9f3b8ae55..a9f3b8ae55 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/DirectionalDraggable.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/DirectionalDraggable.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/EditCameraController.qml b/src/tools/qml2puppet/mockfiles/qt5/EditCameraController.qml
index 5a5796b96b..5a5796b96b 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/EditCameraController.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/EditCameraController.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/EditView3D.qml b/src/tools/qml2puppet/mockfiles/qt5/EditView3D.qml
index 672aca03c6..672aca03c6 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/EditView3D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/EditView3D.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/FadeHandle.qml b/src/tools/qml2puppet/mockfiles/qt5/FadeHandle.qml
index 9ca007057a..9ca007057a 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/FadeHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/FadeHandle.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/HelperGrid.qml b/src/tools/qml2puppet/mockfiles/qt5/HelperGrid.qml
index eef82d4612..eef82d4612 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/HelperGrid.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/HelperGrid.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/IconGizmo.qml b/src/tools/qml2puppet/mockfiles/qt5/IconGizmo.qml
index e44cf74d08..e44cf74d08 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/IconGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/IconGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/IconRenderer3D.qml b/src/tools/qml2puppet/mockfiles/qt5/IconRenderer3D.qml
index 2f64dd93c0..2f64dd93c0 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/IconRenderer3D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/IconRenderer3D.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/LightGizmo.qml b/src/tools/qml2puppet/mockfiles/qt5/LightGizmo.qml
index a20d75120c..a20d75120c 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/LightGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/LightGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/LightIconGizmo.qml b/src/tools/qml2puppet/mockfiles/qt5/LightIconGizmo.qml
index 57144df31e..57144df31e 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/LightIconGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/LightIconGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/LightModel.qml b/src/tools/qml2puppet/mockfiles/qt5/LightModel.qml
index 081a2a2e4d..081a2a2e4d 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/LightModel.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/LightModel.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/Line3D.qml b/src/tools/qml2puppet/mockfiles/qt5/Line3D.qml
index 3b2f5141f2..3b2f5141f2 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/Line3D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/Line3D.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/MaterialNodeView.qml b/src/tools/qml2puppet/mockfiles/qt5/MaterialNodeView.qml
index f347253c80..f347253c80 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/MaterialNodeView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/MaterialNodeView.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/ModelNode2DImageView.qml b/src/tools/qml2puppet/mockfiles/qt5/ModelNode2DImageView.qml
index a1714e87c9..a1714e87c9 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/ModelNode2DImageView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/ModelNode2DImageView.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/ModelNode3DImageView.qml b/src/tools/qml2puppet/mockfiles/qt5/ModelNode3DImageView.qml
index 0e460621a1..0e460621a1 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/ModelNode3DImageView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/ModelNode3DImageView.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/ModelNodeView.qml b/src/tools/qml2puppet/mockfiles/qt5/ModelNodeView.qml
index aaf725129f..aaf725129f 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/ModelNodeView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/ModelNodeView.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/MoveGizmo.qml b/src/tools/qml2puppet/mockfiles/qt5/MoveGizmo.qml
index 76e57cccdb..76e57cccdb 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/MoveGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/MoveGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/NodeNodeView.qml b/src/tools/qml2puppet/mockfiles/qt5/NodeNodeView.qml
index 533af52c39..533af52c39 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/NodeNodeView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/NodeNodeView.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/Overlay2D.qml b/src/tools/qml2puppet/mockfiles/qt5/Overlay2D.qml
index ef59a7717c..ef59a7717c 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/Overlay2D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/Overlay2D.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/PlanarDraggable.qml b/src/tools/qml2puppet/mockfiles/qt5/PlanarDraggable.qml
index 1ae75b2e81..1ae75b2e81 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/PlanarDraggable.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/PlanarDraggable.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/PlanarMoveHandle.qml b/src/tools/qml2puppet/mockfiles/qt5/PlanarMoveHandle.qml
index cb4ba367bc..cb4ba367bc 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/PlanarMoveHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/PlanarMoveHandle.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/PlanarScaleHandle.qml b/src/tools/qml2puppet/mockfiles/qt5/PlanarScaleHandle.qml
index 3dd315989a..3dd315989a 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/PlanarScaleHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/PlanarScaleHandle.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/RotateGizmo.qml b/src/tools/qml2puppet/mockfiles/qt5/RotateGizmo.qml
index b0457c4a97..b0457c4a97 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/RotateGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/RotateGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/RotateRing.qml b/src/tools/qml2puppet/mockfiles/qt5/RotateRing.qml
index 2f898e0d8a..2f898e0d8a 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/RotateRing.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/RotateRing.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/ScaleGizmo.qml b/src/tools/qml2puppet/mockfiles/qt5/ScaleGizmo.qml
index cafb0088e3..cafb0088e3 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/ScaleGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/ScaleGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/ScaleRod.qml b/src/tools/qml2puppet/mockfiles/qt5/ScaleRod.qml
index f13aee9706..f13aee9706 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/ScaleRod.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/ScaleRod.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/SceneView3D.qml b/src/tools/qml2puppet/mockfiles/qt5/SceneView3D.qml
index 103c787f8e..103c787f8e 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/SceneView3D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/SceneView3D.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/SelectionBox.qml b/src/tools/qml2puppet/mockfiles/qt5/SelectionBox.qml
index 9fe071d91a..9fe071d91a 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/SelectionBox.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/SelectionBox.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/SpotLightHandle.qml b/src/tools/qml2puppet/mockfiles/qt5/SpotLightHandle.qml
index 95e486c5f4..95e486c5f4 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/SpotLightHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/SpotLightHandle.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/AdjustableArrow.qml b/src/tools/qml2puppet/mockfiles/qt6/AdjustableArrow.qml
index 164c0a8404..164c0a8404 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/AdjustableArrow.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/AdjustableArrow.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/AreaLightHandle.qml b/src/tools/qml2puppet/mockfiles/qt6/AreaLightHandle.qml
index 80117b84e4..80117b84e4 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/AreaLightHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/AreaLightHandle.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/Arrow.qml b/src/tools/qml2puppet/mockfiles/qt6/Arrow.qml
index cfa01df830..cfa01df830 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/Arrow.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/Arrow.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/AutoScaleHelper.qml b/src/tools/qml2puppet/mockfiles/qt6/AutoScaleHelper.qml
index 08a2082575..08a2082575 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/AutoScaleHelper.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/AutoScaleHelper.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/AxisHelper.qml b/src/tools/qml2puppet/mockfiles/qt6/AxisHelper.qml
index fc2951c732..fc2951c732 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/AxisHelper.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/AxisHelper.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/AxisHelperArm.qml b/src/tools/qml2puppet/mockfiles/qt6/AxisHelperArm.qml
index f8f6e19692..f8f6e19692 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/AxisHelperArm.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/AxisHelperArm.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/CameraFrustum.qml b/src/tools/qml2puppet/mockfiles/qt6/CameraFrustum.qml
index b7b536477b..b7b536477b 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/CameraFrustum.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/CameraFrustum.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/CameraGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/CameraGizmo.qml
index 21195cfadd..21195cfadd 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/CameraGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/CameraGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/DirectionalDraggable.qml b/src/tools/qml2puppet/mockfiles/qt6/DirectionalDraggable.qml
index be4997a3d5..be4997a3d5 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/DirectionalDraggable.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/DirectionalDraggable.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/EditCameraController.qml b/src/tools/qml2puppet/mockfiles/qt6/EditCameraController.qml
index aa15aedb29..aa15aedb29 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/EditCameraController.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/EditCameraController.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/EditView3D.qml b/src/tools/qml2puppet/mockfiles/qt6/EditView3D.qml
index 915feea4f2..915feea4f2 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/EditView3D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/EditView3D.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/FadeHandle.qml b/src/tools/qml2puppet/mockfiles/qt6/FadeHandle.qml
index 9a3e9c4438..9a3e9c4438 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/FadeHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/FadeHandle.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/HelperGrid.qml b/src/tools/qml2puppet/mockfiles/qt6/HelperGrid.qml
index c76490dfe7..c76490dfe7 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/HelperGrid.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/HelperGrid.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/IconGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/IconGizmo.qml
index 70ee9d51f1..70ee9d51f1 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/IconGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/IconGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/LightGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/LightGizmo.qml
index e8a25bb39d..e8a25bb39d 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/LightGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/LightGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/LightIconGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/LightIconGizmo.qml
index b4d7abbb6a..b4d7abbb6a 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/LightIconGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/LightIconGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/LightModel.qml b/src/tools/qml2puppet/mockfiles/qt6/LightModel.qml
index 3208c2211a..3208c2211a 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/LightModel.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/LightModel.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/Line3D.qml b/src/tools/qml2puppet/mockfiles/qt6/Line3D.qml
index df29d0990d..df29d0990d 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/Line3D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/Line3D.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/MaterialNodeView.qml b/src/tools/qml2puppet/mockfiles/qt6/MaterialNodeView.qml
index 9fd74b55dd..9fd74b55dd 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/MaterialNodeView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/MaterialNodeView.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ModelNode2DImageView.qml b/src/tools/qml2puppet/mockfiles/qt6/ModelNode2DImageView.qml
index bf95be9c82..bf95be9c82 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ModelNode2DImageView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/ModelNode2DImageView.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ModelNode3DImageView.qml b/src/tools/qml2puppet/mockfiles/qt6/ModelNode3DImageView.qml
index 3eaed5c210..3eaed5c210 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ModelNode3DImageView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/ModelNode3DImageView.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ModelNodeView.qml b/src/tools/qml2puppet/mockfiles/qt6/ModelNodeView.qml
index 7ae513d27a..7ae513d27a 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ModelNodeView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/ModelNodeView.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/MoveGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/MoveGizmo.qml
index 6f10038d1b..6f10038d1b 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/MoveGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/MoveGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/NodeNodeView.qml b/src/tools/qml2puppet/mockfiles/qt6/NodeNodeView.qml
index 242d9cf0b9..242d9cf0b9 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/NodeNodeView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/NodeNodeView.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/Overlay2D.qml b/src/tools/qml2puppet/mockfiles/qt6/Overlay2D.qml
index e2573bed66..e2573bed66 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/Overlay2D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/Overlay2D.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ParticleEmitterGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/ParticleEmitterGizmo.qml
index 829556ecb2..829556ecb2 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ParticleEmitterGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/ParticleEmitterGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ParticleSystemGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/ParticleSystemGizmo.qml
index 153db46680..153db46680 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ParticleSystemGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/ParticleSystemGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/PlanarDraggable.qml b/src/tools/qml2puppet/mockfiles/qt6/PlanarDraggable.qml
index bc11445cf0..bc11445cf0 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/PlanarDraggable.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/PlanarDraggable.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/PlanarMoveHandle.qml b/src/tools/qml2puppet/mockfiles/qt6/PlanarMoveHandle.qml
index c2969f1ab1..c2969f1ab1 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/PlanarMoveHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/PlanarMoveHandle.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/PlanarScaleHandle.qml b/src/tools/qml2puppet/mockfiles/qt6/PlanarScaleHandle.qml
index 916640b230..916640b230 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/PlanarScaleHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/PlanarScaleHandle.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/RotateGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/RotateGizmo.qml
index 0e40045bb2..0e40045bb2 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/RotateGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/RotateGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/RotateRing.qml b/src/tools/qml2puppet/mockfiles/qt6/RotateRing.qml
index 9c0d49ed82..9c0d49ed82 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/RotateRing.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/RotateRing.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ScaleGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/ScaleGizmo.qml
index 6335e7707c..6335e7707c 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ScaleGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/ScaleGizmo.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ScaleRod.qml b/src/tools/qml2puppet/mockfiles/qt6/ScaleRod.qml
index 2c6cf64997..2c6cf64997 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ScaleRod.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/ScaleRod.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/SceneView3D.qml b/src/tools/qml2puppet/mockfiles/qt6/SceneView3D.qml
index 3fd0417b27..3fd0417b27 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/SceneView3D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/SceneView3D.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/SelectionBox.qml b/src/tools/qml2puppet/mockfiles/qt6/SelectionBox.qml
index d365387052..d365387052 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/SelectionBox.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/SelectionBox.qml
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/SpotLightHandle.qml b/src/tools/qml2puppet/mockfiles/qt6/SpotLightHandle.qml
index def0a5b4fc..def0a5b4fc 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/SpotLightHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/SpotLightHandle.qml
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/Info.plist b/src/tools/qml2puppet/qml2puppet/Info.plist
index f8d63231ea..f8d63231ea 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/Info.plist
+++ b/src/tools/qml2puppet/qml2puppet/Info.plist
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/camerageometry.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/camerageometry.cpp
index b551617e09..b551617e09 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/camerageometry.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/camerageometry.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/camerageometry.h b/src/tools/qml2puppet/qml2puppet/editor3d/camerageometry.h
index 9b4ec924fc..9b4ec924fc 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/camerageometry.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/camerageometry.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/editor3d.pri b/src/tools/qml2puppet/qml2puppet/editor3d/editor3d.pri
index 6eedaad8f1..6eedaad8f1 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/editor3d.pri
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/editor3d.pri
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
index 7109bddae0..7109bddae0 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.h
index 402cd94a3c..402cd94a3c 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/geometrybase.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/geometrybase.cpp
index 4e09944739..4e09944739 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/geometrybase.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/geometrybase.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/geometrybase.h b/src/tools/qml2puppet/qml2puppet/editor3d/geometrybase.h
index a50009b0c8..a50009b0c8 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/geometrybase.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/geometrybase.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/gridgeometry.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/gridgeometry.cpp
index d2f04ef38f..d2f04ef38f 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/gridgeometry.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/gridgeometry.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/gridgeometry.h b/src/tools/qml2puppet/qml2puppet/editor3d/gridgeometry.h
index 376c9d3bf4..376c9d3bf4 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/gridgeometry.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/gridgeometry.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/icongizmoimageprovider.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/icongizmoimageprovider.cpp
index 9f045ebe40..9f045ebe40 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/icongizmoimageprovider.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/icongizmoimageprovider.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/icongizmoimageprovider.h b/src/tools/qml2puppet/qml2puppet/editor3d/icongizmoimageprovider.h
index 4cc9ee3795..4cc9ee3795 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/icongizmoimageprovider.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/icongizmoimageprovider.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/lightgeometry.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/lightgeometry.cpp
index dd15a65595..dd15a65595 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/lightgeometry.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/lightgeometry.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/lightgeometry.h b/src/tools/qml2puppet/qml2puppet/editor3d/lightgeometry.h
index d9eff21c76..d9eff21c76 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/lightgeometry.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/lightgeometry.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/linegeometry.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/linegeometry.cpp
index c4a18f1e8f..c4a18f1e8f 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/linegeometry.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/linegeometry.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/linegeometry.h b/src/tools/qml2puppet/qml2puppet/editor3d/linegeometry.h
index 79ac58721d..79ac58721d 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/linegeometry.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/linegeometry.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/mousearea3d.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp
index 7430fb0e95..7430fb0e95 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/mousearea3d.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/mousearea3d.h b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.h
index a6bea46e59..a6bea46e59 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/mousearea3d.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/qt5compat/qquick3darealight.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/qt5compat/qquick3darealight.cpp
index dd43ba8221..dd43ba8221 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/qt5compat/qquick3darealight.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/qt5compat/qquick3darealight.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/qt5compat/qquick3darealight_p.h b/src/tools/qml2puppet/qml2puppet/editor3d/qt5compat/qquick3darealight_p.h
index b1bda055b2..b1bda055b2 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/qt5compat/qquick3darealight_p.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/qt5compat/qquick3darealight_p.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.cpp
index 1198047848..1198047848 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.h b/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.h
index 46a9d25159..46a9d25159 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp b/src/tools/qml2puppet/qml2puppet/iconrenderer/iconrenderer.cpp
index 453fa24473..453fa24473 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp
+++ b/src/tools/qml2puppet/qml2puppet/iconrenderer/iconrenderer.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.h b/src/tools/qml2puppet/qml2puppet/iconrenderer/iconrenderer.h
index 856811b767..856811b767 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.h
+++ b/src/tools/qml2puppet/qml2puppet/iconrenderer/iconrenderer.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.pri b/src/tools/qml2puppet/qml2puppet/iconrenderer/iconrenderer.pri
index 59d5b12cee..59d5b12cee 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.pri
+++ b/src/tools/qml2puppet/qml2puppet/iconrenderer/iconrenderer.pri
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/import3d/import3d.cpp b/src/tools/qml2puppet/qml2puppet/import3d/import3d.cpp
index 70857065ee..70857065ee 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/import3d/import3d.cpp
+++ b/src/tools/qml2puppet/qml2puppet/import3d/import3d.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/import3d/import3d.h b/src/tools/qml2puppet/qml2puppet/import3d/import3d.h
index 57b1013acc..57b1013acc 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/import3d/import3d.h
+++ b/src/tools/qml2puppet/qml2puppet/import3d/import3d.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/import3d/import3d.pri b/src/tools/qml2puppet/qml2puppet/import3d/import3d.pri
index 8e4d6b6a31..8e4d6b6a31 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/import3d/import3d.pri
+++ b/src/tools/qml2puppet/qml2puppet/import3d/import3d.pri
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
index 5a32a599fb..5a32a599fb 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/anchorchangesnodeinstance.h
index cab4ba631a..cab4ba631a 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/anchorchangesnodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/animationdriver.cpp b/src/tools/qml2puppet/qml2puppet/instances/animationdriver.cpp
index bc8251f2d8..bc8251f2d8 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/animationdriver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/animationdriver.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/animationdriver.h b/src/tools/qml2puppet/qml2puppet/instances/animationdriver.h
index 8b945dc725..8b945dc725 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/animationdriver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/animationdriver.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/behaviornodeinstance.cpp
index dd15d24167..dd15d24167 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/behaviornodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/behaviornodeinstance.h
index 0203718d02..0203718d02 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/behaviornodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.cpp b/src/tools/qml2puppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.cpp
index df207c0ba7..df207c0ba7 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.h b/src/tools/qml2puppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.h
index 396caa4d72..396caa4d72 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.cpp b/src/tools/qml2puppet/qml2puppet/instances/childrenchangeeventfilter.cpp
index 63a8070240..63a8070240 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/childrenchangeeventfilter.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.h b/src/tools/qml2puppet/qml2puppet/instances/childrenchangeeventfilter.h
index 5e1a4c9dd6..5e1a4c9dd6 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/childrenchangeeventfilter.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/componentnodeinstance.cpp
index a0b297c95f..a0b297c95f 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/componentnodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/componentnodeinstance.h
index ef0f89e27c..ef0f89e27c 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/componentnodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummycontextobject.cpp b/src/tools/qml2puppet/qml2puppet/instances/dummycontextobject.cpp
index c0074eccbc..c0074eccbc 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummycontextobject.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/dummycontextobject.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummycontextobject.h b/src/tools/qml2puppet/qml2puppet/instances/dummycontextobject.h
index cd5b884dfc..cd5b884dfc 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummycontextobject.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/dummycontextobject.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/dummynodeinstance.cpp
index e993d4f8ea..e993d4f8ea 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/dummynodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/dummynodeinstance.h
index 1ab8ad4bf6..1ab8ad4bf6 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/dummynodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri b/src/tools/qml2puppet/qml2puppet/instances/instances.pri
index 2d3b4ceedf..2d3b4ceedf 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri
+++ b/src/tools/qml2puppet/qml2puppet/instances/instances.pri
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/layoutnodeinstance.cpp
index e895e58e40..e895e58e40 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/layoutnodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/layoutnodeinstance.h
index 015273b6ba..015273b6ba 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/layoutnodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.cpp
index 9fe970f8c7..9fe970f8c7 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.h
index 59236a236f..59236a236f 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserverdispatcher.cpp b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserverdispatcher.cpp
index 8a78b79cce..8a78b79cce 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserverdispatcher.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserverdispatcher.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserverdispatcher.h b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserverdispatcher.h
index a691858c30..a691858c30 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserverdispatcher.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserverdispatcher.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp b/src/tools/qml2puppet/qml2puppet/instances/nodeinstancesignalspy.cpp
index 6688c809d5..6688c809d5 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/nodeinstancesignalspy.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h b/src/tools/qml2puppet/qml2puppet/instances/nodeinstancesignalspy.h
index 6691da10fb..6691da10fb 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/nodeinstancesignalspy.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp
index fe51d7ecc7..fe51d7ecc7 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.h
index f4724e6cd7..f4724e6cd7 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/positionernodeinstance.cpp
index ea83b83f33..ea83b83f33 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/positionernodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/positionernodeinstance.h
index a8052225f7..a8052225f7 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/positionernodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/qmlpropertychangesnodeinstance.cpp
index e836cd49a3..e836cd49a3 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qmlpropertychangesnodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
index 85285a7412..85285a7412 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/qmlstatenodeinstance.cpp
index e60ca48da7..e60ca48da7 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qmlstatenodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/qmlstatenodeinstance.h
index 95fce95c1b..95fce95c1b 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qmlstatenodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/qmltransitionnodeinstance.cpp
index 6f0e01c457..6f0e01c457 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qmltransitionnodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/qmltransitionnodeinstance.h
index 2fa9aca127..2fa9aca127 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qmltransitionnodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt3dpresentationnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt3dpresentationnodeinstance.cpp
index 55df28a3f9..55df28a3f9 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt3dpresentationnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt3dpresentationnodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt3dpresentationnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/qt3dpresentationnodeinstance.h
index 6d30b9809c..6d30b9809c 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt3dpresentationnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt3dpresentationnodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.cpp
index de779748ae..de779748ae 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.h
index 895daec5d6..895daec5d6 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.cpp
index 3a03f7c9fb..3a03f7c9fb 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.h
index bb5e9816a0..bb5e9816a0 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index 1021a56823..1021a56823 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
index 2099c184d9..2099c184d9 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp
index bc0f782162..bc0f782162 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h
index ac5d888311..ac5d888311 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
index c7bf859daa..c7bf859daa 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.h
index 046a0e61e5..046a0e61e5 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
index 6f3fced1b7..6f3fced1b7 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5previewnodeinstanceserver.h
index e4f860b6b6..e4f860b6b6 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5previewnodeinstanceserver.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
index 07212ec459..07212ec459 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
index 13fdd7f8e5..13fdd7f8e5 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
index ee0bc3ffdc..ee0bc3ffdc 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5testnodeinstanceserver.h
index ca5cf7b063..ca5cf7b063 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5testnodeinstanceserver.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dmaterialnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/quick3dmaterialnodeinstance.cpp
index d518fa6ae5..d518fa6ae5 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dmaterialnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3dmaterialnodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dmaterialnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/quick3dmaterialnodeinstance.h
index 84edfc2ea0..84edfc2ea0 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dmaterialnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3dmaterialnodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/quick3dnodeinstance.cpp
index 95e4a8281b..95e4a8281b 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3dnodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/quick3dnodeinstance.h
index b8120a9092..b8120a9092 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3dnodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3drenderablenodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/quick3drenderablenodeinstance.cpp
index 67741db5de..67741db5de 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3drenderablenodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3drenderablenodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3drenderablenodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/quick3drenderablenodeinstance.h
index 98fba654d8..98fba654d8 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3drenderablenodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3drenderablenodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dtexturenodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/quick3dtexturenodeinstance.cpp
index 4e63e88d54..4e63e88d54 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dtexturenodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3dtexturenodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dtexturenodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/quick3dtexturenodeinstance.h
index 77a3e32a2a..77a3e32a2a 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dtexturenodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3dtexturenodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.cpp
index 918e147798..918e147798 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.h
index 65d84fac65..65d84fac65 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp
index 8ea0eaf806..8ea0eaf806 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.h
index e60fceeea9..e60fceeea9 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/viewconfig.cpp b/src/tools/qml2puppet/qml2puppet/instances/viewconfig.cpp
index 39f108e49a..39f108e49a 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/viewconfig.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/viewconfig.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/viewconfig.h b/src/tools/qml2puppet/qml2puppet/instances/viewconfig.h
index 17e4df1a47..17e4df1a47 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/viewconfig.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/viewconfig.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp b/src/tools/qml2puppet/qml2puppet/qml2puppetmain.cpp
index 2d7518b81b..2d7518b81b 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp
+++ b/src/tools/qml2puppet/qml2puppet/qml2puppetmain.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp
index 5d36ff8755..5d36ff8755 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp
+++ b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.h
index 7ba9e1b2ce..7ba9e1b2ce 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h
+++ b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.h
diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.pri b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.pri
index 896ab52b00..896ab52b00 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.pri
+++ b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.pri
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc b/src/tools/qml2puppet/qmlpuppet.qrc
index 162c955ac1..162c955ac1 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc
+++ b/src/tools/qml2puppet/qmlpuppet.qrc
diff --git a/tests/unit/unittest/CMakeLists.txt b/tests/unit/unittest/CMakeLists.txt
index dc390d9263..4e2deb605d 100644
--- a/tests/unit/unittest/CMakeLists.txt
+++ b/tests/unit/unittest/CMakeLists.txt
@@ -155,8 +155,8 @@ extend_qtc_test(unittest
     "${QmlDesignerDir}/designercore"
     "${QmlDesignerDir}/designercore/include"
     "${QmlDesignerDir}/designercore/imagecache"
-    "${QmlDesignerDir}/../../../share/qtcreator/qml/qmlpuppet/interfaces"
-    "${QmlDesignerDir}/../../../share/qtcreator/qml/qmlpuppet/types"
+    "${QmlDesignerDir}/../../../src/libs/qmlpuppetcommunication/interfaces"
+    "${QmlDesignerDir}/../../../src/libs/qmlpuppetcommunication/types"
   DEFINES
     QMLDESIGNERCORE_STATIC_LIBRARY QMLDESIGNER_STATIC_LIBRARY
   SOURCES_PREFIX
@@ -167,7 +167,7 @@ extend_qtc_test(unittest
 extend_qtc_test(unittest
   SOURCES_PREFIX "${QmlDesignerDir}/designercore"
   SOURCES
-    ../../../../share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h
+    ../../../../src/libs/qmlpuppetcommunication/interfaces/commondefines.h
     ../components/listmodeleditor/listmodeleditormodel.cpp
     ../components/listmodeleditor/listmodeleditormodel.h
     exceptions/exception.cpp