diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-12-16 16:19:44 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-12-16 16:19:44 +0100 |
| commit | 267946d100190d2e76dc444463e690257860cbb7 (patch) | |
| tree | 80b1a0260a8f8f7745e9bf27a3b3e267c454660d /src/tools | |
| parent | 3dfa18818240006d1458f8f9104b4b8c336a60e0 (diff) | |
| parent | 0d005b7057bad62797ac9f5a9afe81db683a42b0 (diff) | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/boot2qt/qdbrunconfiguration.cpp
src/plugins/boot2qt/qdbrunconfiguration.h
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
src/plugins/qnx/qnxrunconfiguration.cpp
src/plugins/remotelinux/remotelinuxrunconfiguration.h
Change-Id: I17c8e1bf300bb75d7317ccf7749dd3cc07709c21
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qml2puppet/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/tools/qml2puppet/qml2puppet.qbs | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt index 141c8ff405..fc502b9e8b 100644 --- a/src/tools/qml2puppet/CMakeLists.txt +++ b/src/tools/qml2puppet/CMakeLists.txt @@ -46,7 +46,8 @@ extend_qtc_executable(qml2puppet tokencommand.cpp tokencommand.h changeselectioncommand.cpp changeselectioncommand.h drop3dlibraryitemcommand.cpp drop3dlibraryitemcommand.h - change3dviewcommand.cpp change3dviewcommand.h + update3dviewstatecommand.cpp update3dviewstatecommand.h + enable3dviewcommand.cpp enable3dviewcommand.h valueschangedcommand.cpp ) diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs index 4071978749..fb73413038 100644 --- a/src/tools/qml2puppet/qml2puppet.qbs +++ b/src/tools/qml2puppet/qml2puppet.qbs @@ -97,8 +97,10 @@ QtcTool { "commands/changeselectioncommand.h", "commands/drop3dlibraryitemcommand.cpp", "commands/drop3dlibraryitemcommand.h", - "commands/change3dviewcommand.cpp", - "commands/change3dviewcommand.h", + "commands/update3dviewstatecommand.cpp", + "commands/update3dviewstatecommand.h", + "commands/enable3dviewcommand.cpp", + "commands/enable3dviewcommand.h", "container/addimportcontainer.cpp", "container/addimportcontainer.h", "container/idcontainer.cpp", |