diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:05:01 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:05:01 +0100 |
commit | 7d7038d47a72cd203785080e997458f0d44f5e15 (patch) | |
tree | 3b1b1cbbc2bd68f8c8cb998830d8c5fe02ac1f88 | |
parent | c6e1dd505f3084ba0a6e9ea023f15be527efceed (diff) | |
parent | 54adef94a3e9f6112fc74c59bde2b122bcb0e6e3 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1
Change-Id: Ic663469af239791f81397bcffad3ca29fa0e6693
-rw-r--r-- | dist/changes-5.12.1 | 20 | ||||
-rw-r--r-- | src/datavisualization/utils/utils.cpp | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/dist/changes-5.12.1 b/dist/changes-5.12.1 new file mode 100644 index 00000000..1cb4dd73 --- /dev/null +++ b/dist/changes-5.12.1 @@ -0,0 +1,20 @@ +Qt 5.12.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. 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; |