diff options
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmlbind.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp index a714c0285b..c474128553 100644 --- a/src/qml/types/qqmlbind.cpp +++ b/src/qml/types/qqmlbind.cpp @@ -81,6 +81,7 @@ enum class QQmlBindEntryKind: quint8 { * and the new kind is returned. */ union QQmlBindEntryContent { + Q_DISABLE_COPY_MOVE(QQmlBindEntryContent) public: QQmlBindEntryContent() {} ~QQmlBindEntryContent() {} @@ -175,9 +176,6 @@ private: Q_ASSERT(dead == QQmlBindEntryKind::None); Q_UNUSED(dead); } - - QQmlBindEntryContent &operator=(const QQmlBindEntryContent &) = delete; - QQmlBindEntryContent &operator=(QQmlBindEntryContent &&) = delete; }; /*! @@ -191,7 +189,7 @@ private: struct QQmlBindEntry { QQmlBindEntry() = default; - QQmlBindEntry(QQmlBindEntry &&other) : prop(std::move(other.prop)) + QQmlBindEntry(QQmlBindEntry &&other) noexcept : prop(std::move(other.prop)) { currentKind = current.set(std::move(other.current), other.currentKind, currentKind); previousKind = previous.set(std::move(other.previous), other.previousKind, previousKind); @@ -210,7 +208,7 @@ struct QQmlBindEntry previousKind = previous.destroy(previousKind); } - QQmlBindEntry &operator=(QQmlBindEntry &&other) + QQmlBindEntry &operator=(QQmlBindEntry &&other) noexcept { if (this == &other) return *this; |