summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-05-05 21:23:44 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-05-06 09:54:17 +0200
commit660b38bb2c4a7650ed04dc0f2feb2bf93d4e6739 (patch)
treea55842c2d648151560354a0fccd45efbfeddb681 /src/opengl
parentd39fefc0ebc8481dd695be031d9479a6ee397612 (diff)
Remove a bunch of deprecated members from src/gui/painting classes
Also remove dead code that isn't compiled anymore in Qt 6 builds. Change-Id: I7a7ae35e61fb2ad9cc21180fb7224357ade1505f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qopenglpaintengine.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/opengl/qopenglpaintengine.cpp b/src/opengl/qopenglpaintengine.cpp
index 66974aff79..d1e8cabf28 100644
--- a/src/opengl/qopenglpaintengine.cpp
+++ b/src/opengl/qopenglpaintengine.cpp
@@ -1475,17 +1475,10 @@ void QOpenGL2PaintEngineEx::renderHintsChanged()
#if !QT_CONFIG(opengles2)
if (!QOpenGLContext::currentContext()->isOpenGLES()) {
Q_D(QOpenGL2PaintEngineEx);
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
- if ((state()->renderHints & QPainter::Antialiasing)
-#if QT_DEPRECATED_SINCE(5, 14)
- || (state()->renderHints & QPainter::HighQualityAntialiasing)
-#endif
- )
+ if (state()->renderHints & QPainter::Antialiasing)
d->funcs.glEnable(GL_MULTISAMPLE);
else
d->funcs.glDisable(GL_MULTISAMPLE);
-QT_WARNING_POP
}
#endif // !QT_CONFIG(opengles2)