diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-11-11 12:58:11 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-11-11 12:58:11 +0100 |
| commit | 646c7860cb95fd7e6c36aa640ea1a2f5fde7d59a (patch) | |
| tree | 727866c9ea7a22f61978e56212e5fd99726b128d /src/tools | |
| parent | a5044727900b3db78746ae17f72d20da1fd3a8ca (diff) | |
| parent | c6115771f9b71e065cb49328bf9d387d327ac996 (diff) | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
src/plugins/genericprojectmanager/genericprojectplugin.cpp
src/plugins/projectexplorer/environmentaspect.cpp
src/plugins/projectexplorer/environmentaspect.h
src/plugins/projectexplorer/environmentaspectwidget.cpp
Change-Id: Id21d62cf14419febd1e06c9b429fcdf4501c0eaf
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 d2f43adc1b..46a82eeece 100644 --- a/src/tools/qml2puppet/CMakeLists.txt +++ b/src/tools/qml2puppet/CMakeLists.txt @@ -109,6 +109,7 @@ extend_qtc_executable(qml2puppet SOURCES cameracontrolhelper.cpp cameracontrolhelper.h mousearea3d.cpp mousearea3d.h + camerageometry.cpp camerageometry.h ) extend_qtc_executable(qml2puppet diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs index 5bf57a534c..540a2a3c08 100644 --- a/src/tools/qml2puppet/qml2puppet.qbs +++ b/src/tools/qml2puppet/qml2puppet.qbs @@ -199,6 +199,8 @@ QtcTool { "editor3d/cameracontrolhelper.h", "editor3d/mousearea3d.cpp", "editor3d/mousearea3d.h", + "editor3d/camerageometry.cpp", + "editor3d/camerageometry.h", "qml2puppetmain.cpp", ] } |