From ace3b97d4c295d66cbcbfc2af05f7a50e7dab0f6 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Mon, 10 Mar 2014 10:35:03 +0100 Subject: Fix deprecated setOption() usage in GLX integration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The correct function is setOptions(). Change-Id: Ife9ff75c409c843b4871804fcfd06b9d2a7733d3 Reviewed-by: Jørgen Lind Reviewed-by: Sean Harmer --- src/plugins/platforms/xcb/qglxintegration.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/xcb/qglxintegration.cpp') diff --git a/src/plugins/platforms/xcb/qglxintegration.cpp b/src/plugins/platforms/xcb/qglxintegration.cpp index eaa4d05311..c183deb3b8 100644 --- a/src/plugins/platforms/xcb/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/qglxintegration.cpp @@ -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); -- cgit v1.2.3