diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-12-06 13:04:17 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-12-07 18:39:54 +0200 |
| commit | 49f6b0146a520e61477aacdf8d1f4e7048f569dd (patch) | |
| tree | 1bc5b9a7f72bfe25b70109190b018c6549403813 /src/tools | |
| parent | 3c41b91d44838fcadfa50c4044e338d43a27cc10 (diff) | |
| parent | 9eed77fe86ed91b08d4f9dc23d3534eeb3dfff6a (diff) | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/mcusupport/mcusupportrunconfiguration.cpp
src/plugins/python/pythonproject.cpp
src/plugins/qmakeprojectmanager/qmakestep.cpp
src/plugins/qmlprojectmanager/qmlproject.cpp
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
Change-Id: I22507be28fd80c49c9fee0dff5937a40db176a82
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 e2475a3ae7..141c8ff405 100644 --- a/src/tools/qml2puppet/CMakeLists.txt +++ b/src/tools/qml2puppet/CMakeLists.txt @@ -46,6 +46,7 @@ extend_qtc_executable(qml2puppet tokencommand.cpp tokencommand.h changeselectioncommand.cpp changeselectioncommand.h drop3dlibraryitemcommand.cpp drop3dlibraryitemcommand.h + change3dviewcommand.cpp change3dviewcommand.h valueschangedcommand.cpp ) diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs index fe42083d6e..4071978749 100644 --- a/src/tools/qml2puppet/qml2puppet.qbs +++ b/src/tools/qml2puppet/qml2puppet.qbs @@ -97,6 +97,8 @@ QtcTool { "commands/changeselectioncommand.h", "commands/drop3dlibraryitemcommand.cpp", "commands/drop3dlibraryitemcommand.h", + "commands/change3dviewcommand.cpp", + "commands/change3dviewcommand.h", "container/addimportcontainer.cpp", "container/addimportcontainer.h", "container/idcontainer.cpp", |