diff options
author | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-06-25 07:05:38 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-06-25 07:07:46 +0000 |
commit | a2bd6a2a820fc2f2c881102f884df34a190505c7 (patch) | |
tree | ef02df36684c75442dc484d010ee9b5522877342 | |
parent | 05e378b2fcbe72725b4736946d65c1290c291d25 (diff) |
Fix dynamic OpenGL ANGLE issue for planets-qml examplev5.5.0
Change-Id: I2d645189ed50567195f4fc1df8ec3e468037fb92
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
-rw-r--r-- | examples/qt3d/planets-qml/main.cpp | 16 |
1 files 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(); |