diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-08 20:31:31 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-08 20:31:31 +0200 |
commit | 9cfdd66b6452704349b5f986f31b7f1f03748cb5 (patch) | |
tree | f23fcc32c0da325402ab9be3da144525d4823f9b /src/corelib/tools/qhash.h | |
parent | 167782691678d6b1588d875036097fadaaced829 (diff) | |
parent | 1326cd15f7ba985551f0fddc717e3bfc01ddda85 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/tools/qhash.h')
-rw-r--r-- | src/corelib/tools/qhash.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index 67924c0888..1d76a2b3d1 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -326,7 +326,9 @@ public: inline void detach() { if (d->ref.isShared()) detach_helper(); } inline bool isDetached() const { return !d->ref.isShared(); } +#if QT_SUPPORTS(UNSHARABLE_CONTAINERS) inline void setSharable(bool sharable) { if (!sharable) detach(); if (d != &QHashData::shared_null) d->sharable = sharable; } +#endif inline bool isSharedWith(const QHash<Key, T> &other) const { return d == other.d; } void clear(); |