diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-10-23 07:41:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-10-23 07:41:01 +0200 |
| commit | 9760d02b77c31c9ed34bd10703d0fc55b9cdb300 (patch) | |
| tree | 6faf6a17abe30669acd30a7041b8a58b7bddcd86 /src/tools | |
| parent | b8657ac73930bc729d601366b047528847413f9e (diff) | |
| parent | 1b655f76ad61cc17483d00b8ece06e08afaeaf01 (diff) | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp
src/plugins/qtsupport/qtversionmanager.cpp
Change-Id: I2f29dd2e86b028be46184b12ac2c17ace2513d5a
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qml2puppet/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | src/tools/qml2puppet/qml2puppet.qbs | 6 |
2 files changed, 22 insertions, 0 deletions
diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt index 3715ae9349..105b0a63f0 100644 --- a/src/tools/qml2puppet/CMakeLists.txt +++ b/src/tools/qml2puppet/CMakeLists.txt @@ -44,6 +44,7 @@ extend_qtc_executable(qml2puppet statepreviewimagechangedcommand.cpp statepreviewimagechangedcommand.h synchronizecommand.cpp synchronizecommand.h tokencommand.cpp tokencommand.h + changeselectioncommand.cpp changeselectioncommand.h valueschangedcommand.cpp ) @@ -86,6 +87,14 @@ extend_qtc_executable(qml2puppet nodeinstanceclientproxy.cpp nodeinstanceclientproxy.h ) +find_package(Qt5 COMPONENTS Quick3D QUIET) +extend_qtc_executable(qml2puppet + CONDITION TARGET Qt5::Quick3 + FEATURE_INFO "Qt Quick 3D" + DEPENDS Qt5::Quick3D + DEFINES QUICK3D_MODULE +) + extend_qtc_executable(qml2puppet SOURCES_PREFIX "${SRCDIR}/interfaces" SOURCES @@ -96,6 +105,12 @@ extend_qtc_executable(qml2puppet ) extend_qtc_executable(qml2puppet + SOURCES_PREFIX "${SRCDIR}/qml2puppet/editor3d" + SOURCES + cameracontrolhelper.cpp cameracontrolhelper.h +) + +extend_qtc_executable(qml2puppet SOURCES_PREFIX "${SRCDIR}/qml2puppet/instances" SOURCES anchorchangesnodeinstance.cpp anchorchangesnodeinstance.h @@ -119,6 +134,7 @@ extend_qtc_executable(qml2puppet qt5previewnodeinstanceserver.cpp qt5previewnodeinstanceserver.h qt5rendernodeinstanceserver.cpp qt5rendernodeinstanceserver.h qt5testnodeinstanceserver.cpp qt5testnodeinstanceserver.h + quick3dnodeinstance.cpp quick3dnodeinstance.h quickitemnodeinstance.cpp quickitemnodeinstance.h servernodeinstance.cpp servernodeinstance.h ) diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs index 02a6f6e31f..995c29eac0 100644 --- a/src/tools/qml2puppet/qml2puppet.qbs +++ b/src/tools/qml2puppet/qml2puppet.qbs @@ -93,6 +93,8 @@ QtcTool { "commands/tokencommand.h", "commands/valueschangedcommand.cpp", "commands/valueschangedcommand.h", + "commands/changeselectioncommand.cpp", + "commands/changeselectioncommand.h", "container/addimportcontainer.cpp", "container/addimportcontainer.h", "container/idcontainer.cpp", @@ -173,6 +175,8 @@ QtcTool { "instances/qmlpropertychangesnodeinstance.h", "instances/qmlstatenodeinstance.cpp", "instances/qmlstatenodeinstance.h", + "instances/quick3dnodeinstance.cpp", + "instances/quick3dnodeinstance.h", "instances/qmltransitionnodeinstance.cpp", "instances/qmltransitionnodeinstance.h", "instances/qt3dpresentationnodeinstance.cpp", @@ -191,6 +195,8 @@ QtcTool { "instances/qt5testnodeinstanceserver.h", "instances/servernodeinstance.cpp", "instances/servernodeinstance.h", + "editor3d/cameracontrolhelper.cpp", + "editor3d/cameracontrolhelper.h", "qml2puppetmain.cpp", ] } |