summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2019-11-22 13:00:29 +0200
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2019-11-22 11:11:22 +0000
commit7a46dc620ebe715b95077a04098bec8c039ed978 (patch)
tree052a1a7aa9f9b200bd441881b6bf3c7f5e1b6425
parent1b89d4ba533650ce479b760a0c207d8f2e9c0bad (diff)
downloadqt-creator-7a46dc620ebe715b95077a04098bec8c039ed978.tar.gz
QmlDesigner: Fix build error
Change-Id: I53d425d0b6f4e66c09bd988bd188218cbf51a99c Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index fabb2a67cc..d3747ab3b3 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
@@ -137,7 +137,10 @@ QObject *Qt5InformationNodeInstanceServer::createEditView3D(QQmlEngine *engine)
surfaceFormat.setVersion(4, 1);
surfaceFormat.setProfile(QSurfaceFormat::CoreProfile);
window->setFormat(surfaceFormat);
+
+#ifdef QUICK3D_MODULE
helper->setParent(window);
+#endif
return window;
}