summaryrefslogtreecommitdiff
path: root/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2019-10-10 15:59:31 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2019-10-11 08:10:56 +0000
commitb6790e82a4f622126d731ef030d5c3e6ebc3a816 (patch)
tree699237b1c701e0307006968e112d5f4dcf15e7b2 /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
parent1281774c6a03a9cb3b3c904dda1a219ae1f2cca6 (diff)
downloadqt-creator-b6790e82a4f622126d731ef030d5c3e6ebc3a816.tar.gz
QmlDesigner: Use core profile for edit view
Change-Id: Ic62ec2cc54d9bf30fa41cccdb5b10e9b75c67290 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index f672a20831..6b6ddadeae 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<QWindow *>(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) :