summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-06-10 12:43:10 +0200
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-06-16 12:04:29 +0000
commit0ce2edc56a92f1040d1e9b88bf9fb1fe237a48ab (patch)
treec09e392e65346348c6ba9cbdae2ce6c0259d9e84
parent8bbd56c84553829186babb8b4f64eae9bce16f3b (diff)
Fix gles lib loading on Android
Setting the version breaks on Android as it has no .so versions, leading to aborting apps on devices that support GLES 3.x. Change-Id: Id4381e08a2615a0898def8f075ce5a5c5b9c7a7d Reviewed-by: Jaeyoon Jung <jaeyoon.jung@lge.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
-rw-r--r--src/gui/opengl/qopenglfunctions.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp
index 6219213f2e..88dd897820 100644
--- a/src/gui/opengl/qopenglfunctions.cpp
+++ b/src/gui/opengl/qopenglfunctions.cpp
@@ -3216,7 +3216,11 @@ bool QOpenGLES3Helper::init()
m_gl.setFileName(QStringLiteral("libGLESv2d"));
# endif
# else
+# ifdef Q_OS_ANDROID
+ m_gl.setFileName(QStringLiteral("GLESv2"));
+# else
m_gl.setFileNameAndVersion(QStringLiteral("GLESv2"), 2);
+# endif
# endif // Q_OS_WIN
return m_gl.load();
#else