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

Remove deprecated API from QSurfaceFormat

Browse Source 
Change-Id: I8dacdaa18cea967a85e8835c2440ba53ee5df2e1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Marcel Krems 2020-08-31 03:10:48 +02:00
parent e14e46ccd6
commit e8b0b5c0ce
2 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/gui/kernel/qsurfaceformat.cpp
View File

@ -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

5
src/gui/kernel/qsurfaceformat.h
View File

@ -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;