AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix deprecated setOption() usage in GLX integration

Browse Source 
The correct function is setOptions().

Change-Id: Ife9ff75c409c843b4871804fcfd06b9d2a7733d3
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
This commit is contained in:
Laszlo Agocs 2014-03-10 10:35:03 +01:00 committed by The Qt Project
parent 72fe9f1d0d
commit ace3b97d4c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/xcb/qglxintegration.cpp
View File

@ -130,7 +130,7 @@ static void updateFormatFromContext(QSurfaceFormat &format)
}
format.setProfile(QSurfaceFormat::NoProfile);
format.setOption(QSurfaceFormat::FormatOptions());
format.setOptions(QSurfaceFormat::FormatOptions());
if (format.renderableType() == QSurfaceFormat::OpenGL) {
if (format.version() < qMakePair(3, 0)) {
@ -211,7 +211,7 @@ QGLXContext::QGLXContext(QXcbScreen *screen, const QSurfaceFormat &format, QPlat
// Don't bother with versions below ES 2.0
glVersions << 30 << 20;
// ES does not support any format option
m_format.setOption(QSurfaceFormat::FormatOptions());
m_format.setOptions(QSurfaceFormat::FormatOptions());
}
Q_ASSERT(glVersions.count() > 0);