diff options
| author | Marco Bubke <marco.bubke@qt.io> | 2020-08-12 13:18:24 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-08-13 06:24:10 +0000 |
| commit | dc870f538dd3e11464a3ece179edf024161e14ba (patch) | |
| tree | 9952b363e9c5ca476d9cbd3891523e42b3801037 /share | |
| parent | 208ebd60437666515a4d64b7792a156952ebbc55 (diff) | |
Prepare merge of qds-1.59 to 4.13qds-1.59
It is not compiling but we are closing this branch anyway.
Change-Id: If96318175d92ae492871d668d5c937c473fd05d5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri index ce9bb2376e..fdc862991e 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri @@ -55,4 +55,5 @@ SOURCES += $$PWD/qt5nodeinstanceserver.cpp \ $$PWD/positionernodeinstance.cpp \ $$PWD/layoutnodeinstance.cpp \ $$PWD/qt3dpresentationnodeinstance.cpp \ - $$PWD/quick3dnodeinstance.cpp + $$PWD/quick3dnodeinstance.cpp \ + $$PWD/quick3dtexturenodeinstance.cpp |