aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2019-10-15 18:09:14 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2019-10-16 07:49:28 +0000
commit42fba8ee3bee257974058e2c41f38f6dd77c6e23 (patch)
treef2e2ec0ba072935b127d56a77880b4823ac9eef9
parent84c9f669cac219112470ab8bc6bc00ff3e9248de (diff)
QmlDesigner: Only show 3D edit view if enabled
QMLDESIGNER_QUICK3D_MODE controls if the edit mode should be shown. Change-Id: I4522dc0887486f329fdb140079e6d644f601c77f Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index 257ff92dac..2b644b5959 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
@@ -300,7 +300,8 @@ void Qt5InformationNodeInstanceServer::createScene(const CreateSceneCommand &com
sendChildrenChangedCommand(instanceList);
nodeInstanceClient()->componentCompleted(createComponentCompletedCommand(instanceList));
- setup3DEditView(instanceList);
+ if (qEnvironmentVariableIsSet("QMLDESIGNER_QUICK3D_MODE"))
+ setup3DEditView(instanceList);
}
void Qt5InformationNodeInstanceServer::sendChildrenChangedCommand(const QList<ServerNodeInstance> &childList)