diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-16 03:00:06 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-16 03:00:06 +0200 |
commit | e57ffecf2f49b9344ac50c0977540e1cb2655e57 (patch) | |
tree | a967d0ed3fef32fd1e8bb28f21c236f9be1a0cd5 | |
parent | a8128b1fb5abc4b84663e7e6b5464ddac81f3cd4 (diff) | |
parent | 4832203e382808e365957eec92ca0c5af92a4f91 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Id2762b6e8b03f0e7ae990dad288100f8f4cbb67e
-rw-r--r-- | dist/changes-5.9.5 | 24 | ||||
-rw-r--r-- | dist/changes-5.9.6 | 24 | ||||
-rw-r--r-- | src/effects/private/qgfxshaderbuilder.cpp | 7 |
3 files changed, 54 insertions, 1 deletions
diff --git a/dist/changes-5.9.5 b/dist/changes-5.9.5 new file mode 100644 index 0000000..8df339e --- /dev/null +++ b/dist/changes-5.9.5 @@ -0,0 +1,24 @@ +Qt 5.9.5 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.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.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.9 will continue to run with 5.9. + +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. + +**************************************************************************** +* Qt 5.9.5 Changes * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/dist/changes-5.9.6 b/dist/changes-5.9.6 new file mode 100644 index 0000000..f0179a5 --- /dev/null +++ b/dist/changes-5.9.6 @@ -0,0 +1,24 @@ +Qt 5.9.6 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0 through 5.9.5. + +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.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +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. + +**************************************************************************** +* Qt 5.9.6 Changes * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/src/effects/private/qgfxshaderbuilder.cpp b/src/effects/private/qgfxshaderbuilder.cpp index 22975b5..6439ff3 100644 --- a/src/effects/private/qgfxshaderbuilder.cpp +++ b/src/effects/private/qgfxshaderbuilder.cpp @@ -66,7 +66,12 @@ QGfxShaderBuilder::QGfxShaderBuilder() // thread will get the same capabilities as the render thread's OpenGL // context. Not 100% accurate, but it works... QOpenGLContext context; - context.create(); + if (!context.create()) { + qDebug() << "failed to acquire GL context to resolve capabilities, using defaults.."; + m_maxBlurSamples = 8; // minimum number of varyings in the ES 2.0 spec. + return; + } + QOffscreenSurface surface; // In very odd cases, we can get incompatible configs here unless we pass the // GL context's format on to the offscreen format. |