diff options
| author | Marcel Krems <m.krems@software-vision.eu> | 2020-08-31 03:10:48 +0200 |
|---|---|---|
| committer | Marcel Krems <m.krems@software-vision.eu> | 2020-09-08 08:02:15 +0200 |
| commit | e8b0b5c0cecd699199adf4cab92a2a44ce553e06 (patch) | |
| tree | 38e9269a5879793e7163d525c099cba63f020794 | |
| parent | e14e46ccd686c3b6b9f08d0e1187f9294143cf70 (diff) | |
Remove deprecated API from QSurfaceFormat
Change-Id: I8dacdaa18cea967a85e8835c2440ba53ee5df2e1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| -rw-r--r-- | src/gui/kernel/qsurfaceformat.cpp | 38 | ||||
| -rw-r--r-- | src/gui/kernel/qsurfaceformat.h | 5 |
2 files changed, 0 insertions, 43 deletions
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; |