Deprecate qMove(), Q_DECL_OVERRIDE and Q_DECL_FINAL

This function and the two macros are natively supported by all
compilers needed since Qt 5.7 as explained in
4c704fad089ddd92e9d274faa5a840dd96349ca1

Change-Id: Iac01d2481ef4a6ee333e3ee5f09082a9fba725e8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Christian Ehrlicher 2019-11-24 20:57:19 +01:00
parent 1825426187
commit 2260d680c9

View File

@ -4810,9 +4810,11 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
/*! /*!
\macro qMove(x) \macro qMove(x)
\relates <QtGlobal> \relates <QtGlobal>
\obsolete
It expands to "std::move" if your compiler supports that C++11 function, or to nothing Use \c std::move instead.
otherwise.
It expands to "std::move".
qMove takes an rvalue reference to its parameter \a x, and converts it to an xvalue. qMove takes an rvalue reference to its parameter \a x, and converts it to an xvalue.
*/ */
@ -4913,6 +4915,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
/*! /*!
\macro Q_DECL_OVERRIDE \macro Q_DECL_OVERRIDE
\since 5.0 \since 5.0
\obsolete
\relates <QtGlobal> \relates <QtGlobal>
This macro can be used to declare an overriding virtual This macro can be used to declare an overriding virtual
@ -4920,8 +4923,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
an error if the overriding virtual function does not in fact an error if the overriding virtual function does not in fact
override anything. override anything.
It expands to "override" if your compiler supports that C++11 It expands to "override".
contextual keyword, or to nothing otherwise.
The macro goes at the end of the function, usually after the The macro goes at the end of the function, usually after the
\c{const}, if any: \c{const}, if any:
@ -4933,6 +4935,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
/*! /*!
\macro Q_DECL_FINAL \macro Q_DECL_FINAL
\since 5.0 \since 5.0
\obsolete
\relates <QtGlobal> \relates <QtGlobal>
This macro can be used to declare an overriding virtual or a class This macro can be used to declare an overriding virtual or a class
@ -4940,10 +4943,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
no longer override this virtual function, or inherit from this no longer override this virtual function, or inherit from this
class, respectively. class, respectively.
It expands to "final" if your compiler supports that C++11 It expands to "final".
contextual keyword, or something non-standard if your compiler
supports something close enough to the C++11 semantics, or to
nothing otherwise.
The macro goes at the end of the function, usually after the The macro goes at the end of the function, usually after the
\c{const}, if any: \c{const}, if any: