diff options
| author | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-06-02 04:20:54 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-06-02 04:20:54 +0000 |
| commit | 7bc9310a2265e14b6880aa29d96adba6d3d7aed0 (patch) | |
| tree | 0bf906e3585c93cbe5ef67a05b4a129e18e3edbd /src/gui/kernel/qplatformopenglcontext.cpp | |
| parent | 6e008cd57955c8029671c4c92250b86767f8ec1f (diff) | |
| parent | fcfd31c9fdd84b234cb9e42b97be62ec18389b61 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5.0
Diffstat (limited to 'src/gui/kernel/qplatformopenglcontext.cpp')
| -rw-r--r-- | src/gui/kernel/qplatformopenglcontext.cpp | 4 |
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"); } |