diff options
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | src/datavisualization/utils/utils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 0a6b1e8f..450400ef 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,5 @@ load(qt_build_config) -MODULE_VERSION = 5.12.1 +MODULE_VERSION = 5.12.2 CONFIG += warning_clean CMAKE_MODULE_TESTS=- diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp index df8552b4..f80cf45f 100644 --- a/src/datavisualization/utils/utils.cpp +++ b/src/datavisualization/utils/utils.cpp @@ -367,7 +367,7 @@ void Utils::resolveStatics() const GLubyte *openGLVersion = ctx->functions()->glGetString(GL_VERSION); versionStr = QString::fromLatin1(reinterpret_cast<const char *>(openGLVersion)).toLower(); #endif - if (versionStr.contains(QStringLiteral("mesa")) + if (versionStr.contains(QStringLiteral("mesa"), Qt::CaseInsensitive) || QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL)) { qWarning("Only OpenGL ES2 emulation is available for software rendering."); isES = true; |