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>

share/qtcreator/CMakeLists.txt

@@ -4,7 +4,6 @@ set(resource_directories
   glsl
   indexer_preincludes
   modeleditor
-  qml
   qmldesigner
   qmlicons
   qml-type-descriptions

share/qtcreator/qml/qmlpuppet/commands/commands.pri

@@ -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

share/qtcreator/qml/qmlpuppet/container/container.pri

@@ -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

share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri

@@ -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

share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri

@@ -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

share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro

@@ -1,11 +0,0 @@
-TARGET = qml2puppet
-
-TEMPLATE = app
-CONFIG += console
-
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
-
-include(qml2puppet.pri)

share/qtcreator/qml/qmlpuppet/qmlpuppet_utilities.pri

@@ -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)
-}

share/qtcreator/qml/qmlpuppet/types/types.pri

@@ -1,3 +0,0 @@
-INCLUDEPATH += $$PWD/
-
-HEADERS += $$PWD/enumeration.h

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)
 

src/libs/qmlpuppetcommunication/CMakeLists.txt

@@ -0,0 +1 @@
+include(QmlPuppetCommunication.cmake)

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
+)