diff options
| author | Liang Qi <[email protected]> | 2015-06-01 17:46:58 +0200 |
|---|---|---|
| committer | Liang Qi <[email protected]> | 2015-06-01 17:46:58 +0200 |
| commit | fcfd31c9fdd84b234cb9e42b97be62ec18389b61 (patch) | |
| tree | cbaa212790b49e024dae18ecbcead3bbf16a18cf /src/gui/kernel/qplatformopenglcontext.cpp | |
| parent | 5b739a5b8cfbbedd9265b192d08b346d9b265590 (diff) | |
| parent | 0c5fbd397ceda4d9f0046f1204b5e49229d04312 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/global/qglobal.h
Change-Id: I2c0f7544bf194f2d0f59218fd583c822901487b0
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 b9cf81b30e8..f98f8a496ca 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 [email protected] (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"); } |