Merge remote-tracking branch 'origin/5.5.0' into 5.5

Change-Id: I060b0e10e55487a4a4a101f77ad7c8dc8cf0f553

1 files changed, 4 insertions, 0 deletions

diff --git a/src/gui/kernel/qplatformopenglcontext.cpp b/src/gui/kernel/qplatformopenglcontext.cpp
index b9cf81b30e..f98f8a496c 100644
--- a/src/gui/kernel/qplatformopenglcontext.cpp
+++ b/src/gui/kernel/qplatformopenglcontext.cpp
@@ -131,6 +131,10 @@ bool QPlatformOpenGLContext::parseOpenGLVersion(const QByteArray &versionString,
             if (versionParts.size() >= 2) {
                 major = versionParts.at(0).toInt(&majorOk);
                 minor = versionParts.at(1).toInt(&minorOk);
+                // Nexus 6 has "OpenGL ES 3.0V@95.0 (GIT@I86da836d38)"
+                if (!minorOk)
+                    if (int idx = versionParts.at(1).indexOf('V'))
+                        minor = versionParts.at(1).left(idx).toInt(&minorOk);
             } else {
                 qWarning("Unrecognized OpenGL ES version");
             }