diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-10-28 11:48:31 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-10-28 11:48:31 +0100 |
| commit | bea3a8fa6fd53cf1e85aa30cc45d1e62464c985d (patch) | |
| tree | c9755caff5786475c51c65cfec939ec90ab6ccd2 /src/tools | |
| parent | 3c556096caf17cf6b09a91ebf0d262d0be3f65a1 (diff) | |
| parent | 3f74b04c3072b2beb23ecdd108894da4057830fc (diff) | |
Merge remote-tracking branch 'origin/4.11'
Change-Id: I66389d88d5a60c6c86547b93cca945af42aa807b
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qml2puppet/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/tools/qml2puppet/qml2puppet.qbs | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt index 105b0a63f0..d2f43adc1b 100644 --- a/src/tools/qml2puppet/CMakeLists.txt +++ b/src/tools/qml2puppet/CMakeLists.txt @@ -108,6 +108,7 @@ extend_qtc_executable(qml2puppet SOURCES_PREFIX "${SRCDIR}/qml2puppet/editor3d" SOURCES cameracontrolhelper.cpp cameracontrolhelper.h + mousearea3d.cpp mousearea3d.h ) extend_qtc_executable(qml2puppet diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs index 995c29eac0..5bf57a534c 100644 --- a/src/tools/qml2puppet/qml2puppet.qbs +++ b/src/tools/qml2puppet/qml2puppet.qbs @@ -197,6 +197,8 @@ QtcTool { "instances/servernodeinstance.h", "editor3d/cameracontrolhelper.cpp", "editor3d/cameracontrolhelper.h", + "editor3d/mousearea3d.cpp", + "editor3d/mousearea3d.h", "qml2puppetmain.cpp", ] } |