From 0ce2edc56a92f1040d1e9b88bf9fb1fe237a48ab Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 10 Jun 2015 12:43:10 +0200 Subject: [PATCH] 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 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/gui/opengl/qopenglfunctions.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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