diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-02 12:45:40 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-02 17:36:45 +0200 |
commit | bdcd86c03e1b5c66dec21746d4d3596eb556b77b (patch) | |
tree | 5d9d24c69a704e5c67ac620ce1c04d2373df0728 /src/corelib/tools/qhash.h | |
parent | da888ba53904af75c462af9f753191f25840e51f (diff) | |
parent | ccc6efb6e91756451ffd50d51f7f3ae05bc6df0b (diff) |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
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 40e501355c..f68b02be2c 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -330,7 +330,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(); |