path: root/src/corelib/tools/qmap.h
diff options
authorMarc Mutz <>2015-07-03 13:24:31 +0200
committerMarc Mutz <>2015-07-19 10:33:39 +0000
commit27ba0b8f88c32b800270b13672fc2260f8d2d28f (patch)
tree159ee7d1203851e70b8879816902d65f43d965d5 /src/corelib/tools/qmap.h
parent8ab2d86d054766bbea0f2e40b6c5d703fdf4ad3b (diff)
Containers: destroy previous state on move-assignment immediately
[ChangeLog][QtCore] All generic containers (with the exception of QVarLengthArray, but including QSharedPointer) destroy the previous state as part of a move-assignment now. Previously, they would dump it into the right-hand-side object. Note that this is only true for the generic containers. Other implicitly-shared types, as well as the non-generic containers QString, QByteArray, etc. still just swap the contents with the right-hand-side object when move-assigned into, and, for performance reasons, this will not change in the forseeable future. Change-Id: I1f1c684e85400b77bd2e7fba65bde2dce6c1bdde Reviewed-by: Oswald Buddenhagen <> Reviewed-by: Thiago Macieira <>
Diffstat (limited to 'src/corelib/tools/qmap.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h
index bf0a36aa88..f3d921c968 100644
--- a/src/corelib/tools/qmap.h
+++ b/src/corelib/tools/qmap.h
@@ -344,7 +344,7 @@ public:
inline QMap<Key, T> &operator=(QMap<Key, T> &&other)
- { qSwap(d, other.d); return *this; }
+ { QMap moved(std::move(other)); swap(moved); return *this; }
inline void swap(QMap<Key, T> &other) { qSwap(d, other.d); }
explicit QMap(const typename std::map<Key, T> &other);