diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-20 19:31:18 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-20 19:31:19 +0200 |
| commit | 36c025a8d66b244b6017746b415881ef1814b1e2 (patch) | |
| tree | 419c55a80f161e3882a3060cbcf0762d7a151841 /src/corelib/tools/qlinkedlist.h | |
| parent | d55f2b1fb9c910bc118f75967a0e6273f8aa98d1 (diff) | |
| parent | 8e8bd90e4445415df7b7f516444e594d3e678c1a (diff) | |
Merge 5.7 into 5.7.0
Change-Id: I416c79d9afde98efc9e78b3a74e17dfbb2409602
Diffstat (limited to 'src/corelib/tools/qlinkedlist.h')
| -rw-r--r-- | src/corelib/tools/qlinkedlist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h index 3e0de52da6..e3eed9184f 100644 --- a/src/corelib/tools/qlinkedlist.h +++ b/src/corelib/tools/qlinkedlist.h @@ -105,7 +105,7 @@ public: inline void detach() { if (d->ref.isShared()) detach_helper2(this->e); } inline bool isDetached() const { return !d->ref.isShared(); } -#if QT_SUPPORTS(UNSHARABLE_CONTAINERS) +#if !defined(QT_NO_UNSHARABLE_CONTAINERS) inline void setSharable(bool sharable) { if (!sharable) detach(); if (d != &QLinkedListData::shared_null) d->sharable = sharable; } #endif inline bool isSharedWith(const QLinkedList<T> &other) const { return d == other.d; } |