From e8b0b5c0cecd699199adf4cab92a2a44ce553e06 Mon Sep 17 00:00:00 2001
From: Marcel Krems <m.krems@software-vision.eu>
Date: Mon, 31 Aug 2020 03:10:48 +0200
Subject: Remove deprecated API from QSurfaceFormat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I8dacdaa18cea967a85e8835c2440ba53ee5df2e1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/gui/kernel/qsurfaceformat.cpp | 38 --------------------------------------
 src/gui/kernel/qsurfaceformat.h   |  5 -----
 2 files changed, 43 deletions(-)

(limited to 'src')

diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp
index 6c04abc293..c3048518da 100644
--- a/src/gui/kernel/qsurfaceformat.cpp
+++ b/src/gui/kernel/qsurfaceformat.cpp
@@ -346,44 +346,6 @@ void QSurfaceFormat::setSamples(int numSamples)
     }
 }
 
-#if QT_DEPRECATED_SINCE(5, 2)
-/*!
-    \obsolete
-    \overload
-
-    Use setOption(QSurfaceFormat::FormatOption, bool) or setOptions() instead.
-
-    Sets the format options to the OR combination of \a opt and the
-    current format options.
-
-    \sa options(), testOption()
-*/
-void QSurfaceFormat::setOption(QSurfaceFormat::FormatOptions opt)
-{
-    const QSurfaceFormat::FormatOptions newOptions = d->opts | opt;
-    if (int(newOptions) != int(d->opts)) {
-        detach();
-        d->opts = newOptions;
-    }
-}
-
-/*!
-    \obsolete
-    \overload
-
-    Use testOption(QSurfaceFormat::FormatOption) instead.
-
-    Returns \c true if any of the options in \a opt is currently set
-    on this object; otherwise returns false.
-
-    \sa setOption()
-*/
-bool QSurfaceFormat::testOption(QSurfaceFormat::FormatOptions opt) const
-{
-    return d->opts & opt;
-}
-#endif // QT_DEPRECATED_SINCE(5, 2)
-
 /*!
     \since 5.3
 
diff --git a/src/gui/kernel/qsurfaceformat.h b/src/gui/kernel/qsurfaceformat.h
index ed63eb8bbf..fce3c49136 100644
--- a/src/gui/kernel/qsurfaceformat.h
+++ b/src/gui/kernel/qsurfaceformat.h
@@ -138,11 +138,6 @@ public:
     bool stereo() const;
     void setStereo(bool enable);
 
-#if QT_DEPRECATED_SINCE(5, 2)
-    QT_DEPRECATED void setOption(QSurfaceFormat::FormatOptions opt);
-    QT_DEPRECATED bool testOption(QSurfaceFormat::FormatOptions opt) const;
-#endif
-
     void setOptions(QSurfaceFormat::FormatOptions options);
     void setOption(FormatOption option, bool on = true);
     bool testOption(FormatOption option) const;
-- 
cgit v1.2.3