From 7f661ab61611d48f4491c1fa9d7932e822e9b050 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Wed, 9 Jan 2019 10:09:42 +0200 Subject: Add changes file for Qt 5.12.1 + 7b091d13ed5509a73da921a7ed30034a7eb55131 Bump version + a04bbfd93159963aa505f96425e85a2a83b0b10a Add changes file for Qt 5.11.3 + 9ab15db10215cef84a58a57411f1d27f83aa4b66 Bump version Change-Id: I0b782701187ade64db8d986771b4c858943d6dc1 Reviewed-by: Jani Heikkinen --- dist/changes-5.12.1 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 dist/changes-5.12.1 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. -- cgit v1.2.3 From 96b5237dcd18a0b6f7e34afdde1988797a2d8c5e Mon Sep 17 00:00:00 2001 From: Joni Poikelin Date: Tue, 22 Jan 2019 11:31:03 +0200 Subject: Fix mesa check VMware virtual machines have "OpenGL ES 3.0 Mesa x.x.x" as the version string. Change-Id: I5c23524a021732e84b78090de2913b4d974e9f34 Reviewed-by: Miikka Heikkinen --- src/datavisualization/utils/utils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(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; -- cgit v1.2.3