From a2bd6a2a820fc2f2c881102f884df34a190505c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@theqtcompany.com>
Date: Thu, 25 Jun 2015 07:05:38 +0300
Subject: Fix dynamic OpenGL ANGLE issue for planets-qml example
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I2d645189ed50567195f4fc1df8ec3e468037fb92
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
---
 examples/qt3d/planets-qml/main.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/examples/qt3d/planets-qml/main.cpp b/examples/qt3d/planets-qml/main.cpp
index 396a06083..02c43181f 100644
--- a/examples/qt3d/planets-qml/main.cpp
+++ b/examples/qt3d/planets-qml/main.cpp
@@ -36,24 +36,22 @@
 
 #include <QGuiApplication>
 #include <QQuickView>
+#include <QOpenGLContext>
 
 int main(int argc, char **argv)
 {
     QGuiApplication app(argc, argv);
 
-    QQuickView view;
-
     QSurfaceFormat format;
-#ifndef QT_OPENGL_ES_2
-#ifdef Q_OS_OSX
-    format.setVersion(3, 2);
-#endif
-    format.setProfile(QSurfaceFormat::CoreProfile);
-#endif
+    if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL) {
+        format.setVersion(3, 2);
+        format.setProfile(QSurfaceFormat::CoreProfile);
+    }
     format.setDepthBufferSize(24);
     format.setSamples(4);
-    view.setFormat(format);
 
+    QQuickView view;
+    view.setFormat(format);
     view.setResizeMode(QQuickView::SizeRootObjectToView);
     view.setSource(QUrl("qrc:/PlanetsMain.qml"));
     view.show();
-- 
cgit v1.2.3