diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index b320faa72fb..56246783ed1 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -651,18 +651,7 @@ static_assert(sizeof(qint64) == 8, "Internal error, qint64 is misdefined"); application would probably crash when you called a member function of \c{w}. - \sa Q_DISABLE_COPY_MOVE, Q_DISABLE_MOVE -*/ - -/*! - \macro Q_DISABLE_MOVE(Class) - \relates QObject - - Disables the use of move constructors and move assignment operators - for the given \a Class. - - \sa Q_DISABLE_COPY, Q_DISABLE_COPY_MOVE - \since 5.13 + \sa Q_DISABLE_COPY_MOVE */ /*! @@ -671,9 +660,9 @@ static_assert(sizeof(qint64) == 8, "Internal error, qint64 is misdefined"); A convenience macro that disables the use of copy constructors, assignment operators, move constructors and move assignment operators for the given - \a Class, combining Q_DISABLE_COPY and Q_DISABLE_MOVE. + \a Class. - \sa Q_DISABLE_COPY, Q_DISABLE_MOVE + \sa Q_DISABLE_COPY \since 5.13 */ diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 16bcb14e7da..8bf0e8c6bcc 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -491,13 +491,10 @@ constexpr inline Deprecated_t Deprecated = {}; Class(const Class &) = delete;\ Class &operator=(const Class &) = delete; -#define Q_DISABLE_MOVE(Class) \ - Class(Class &&) = delete; \ - Class &operator=(Class &&) = delete; - #define Q_DISABLE_COPY_MOVE(Class) \ Q_DISABLE_COPY(Class) \ - Q_DISABLE_MOVE(Class) + Class(Class &&) = delete; \ + Class &operator=(Class &&) = delete; /* Implementing a move assignment operator using an established