diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-08-07 13:53:05 -0700 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-08 11:48:10 +0200 |
| commit | 883dfb3d156431eeb3ffc8f02a09c89bb7fa7d46 (patch) | |
| tree | d4c2b3d096e1d5c64be698b5d0cd8c8bae35b2b4 /src/plugins/platforms/xcb/gl_integrations/xcb_glx | |
| parent | 5a9b1425e187bc77122354cf7446bcf6bb322ff4 (diff) | |
| parent | b75bc0f75c09b192dba68449b009cdf175519dbd (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/kernel/qwidget.cpp
This merge also extends the expected output of the pairdiagnostics
teamcity output (added in dev in commit
c608ffc56ab37f9a9d5b9c34543126adb89e2b08) after the recent addition of
the flowId attribute to the teamcity output (commit
8f036562119dd35ce51dc9230304d893b906bd37 in 5.9).
Change-Id: I3868166e5efc45538544fffd14d8aba438f9173c
Diffstat (limited to 'src/plugins/platforms/xcb/gl_integrations/xcb_glx')
| -rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp index 947ac4776c..3bc8590d36 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -221,17 +221,17 @@ void QGLXContext::init(QXcbScreen *screen, QPlatformOpenGLContext *share) QVector<int> glVersions; if (m_format.renderableType() == QSurfaceFormat::OpenGL) { - if (requestedVersion > 45) + if (requestedVersion > 46) glVersions << requestedVersion; // Don't bother with versions below 2.0 - glVersions << 45 << 44 << 43 << 42 << 41 << 40 << 33 << 32 << 31 << 30 << 21 << 20; + glVersions << 46 << 45 << 44 << 43 << 42 << 41 << 40 << 33 << 32 << 31 << 30 << 21 << 20; } else if (m_format.renderableType() == QSurfaceFormat::OpenGLES) { - if (requestedVersion > 31) + if (requestedVersion > 32) glVersions << requestedVersion; // Don't bother with versions below ES 2.0 - glVersions << 31 << 30 << 20; + glVersions << 32 << 31 << 30 << 20; // ES does not support any format option m_format.setOptions(QSurfaceFormat::FormatOptions()); } |