diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 17:50:46 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-19 17:50:46 +0000 |
| commit | 1f8bc502c8d1f9b92cf13c4aefc5f76607f474ab (patch) | |
| tree | bf6d5cebae9c680d2db331c536b88c9a1e684e3d /tests/auto/corelib/tools/qarraydata/simplevector.h | |
| parent | b98f599948ddc0380e3392aab593fd426760d0f0 (diff) | |
| parent | 818014b449ef996099b4795a82f09651cf1c0129 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'tests/auto/corelib/tools/qarraydata/simplevector.h')
| -rw-r--r-- | tests/auto/corelib/tools/qarraydata/simplevector.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/tools/qarraydata/simplevector.h b/tests/auto/corelib/tools/qarraydata/simplevector.h index 90e86dca4e..9dd8b05796 100644 --- a/tests/auto/corelib/tools/qarraydata/simplevector.h +++ b/tests/auto/corelib/tools/qarraydata/simplevector.h @@ -88,7 +88,7 @@ public: bool isStatic() const { return d->ref.isStatic(); } bool isShared() const { return d->ref.isShared(); } bool isSharedWith(const SimpleVector &other) const { return d == other.d; } -#if QT_SUPPORTS(UNSHARABLE_CONTAINERS) +#if !defined(QT_NO_UNSHARABLE_CONTAINERS) bool isSharable() const { return d->ref.isSharable(); } void setSharable(bool sharable) { d.setSharable(sharable); } #endif |