From b6790e82a4f622126d731ef030d5c3e6ebc3a816 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 10 Oct 2019 15:59:31 +0200 Subject: [PATCH] QmlDesigner: Use core profile for edit view Change-Id: Ic62ec2cc54d9bf30fa41cccdb5b10e9b75c67290 Reviewed-by: Mahmoud Badri Reviewed-by: Thomas Hartmann --- .../instances/qt5informationnodeinstanceserver.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp index f672a20831b..6b6ddadeaec 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp @@ -74,7 +74,17 @@ static QVariant objectToVariant(QObject *object) static QObject *createEditView3D(QQmlEngine *engine) { QQmlComponent component(engine, QUrl("qrc:/qtquickplugin/mockfiles/EditView3D.qml")); - return component.create(); + + + QWindow *window = qobject_cast(component.create()); + + //For macOS we have to use the 4.1 core profile + QSurfaceFormat surfaceFormat = window->requestedFormat(); + surfaceFormat.setVersion(4, 1); + surfaceFormat.setProfile(QSurfaceFormat::CoreProfile); + window->setFormat(surfaceFormat); + + return window; } Qt5InformationNodeInstanceServer::Qt5InformationNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient) :