diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-24 05:44:45 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-24 05:44:45 +0000 |
| commit | 4e41babd0337473a1078d3a5f3367cc1fc5f2935 (patch) | |
| tree | fc7a7ceecd529310fcd6a6a869034a8ea75388e1 /src/corelib/tools/qarraydatapointer.h | |
| parent | aa2a3102676a5608d7ad22b868895ec93681a5d9 (diff) | |
| parent | 56d6e000f7487c59172330ebd23a718268c508f1 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/tools/qarraydatapointer.h')
| -rw-r--r-- | src/corelib/tools/qarraydatapointer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qarraydatapointer.h b/src/corelib/tools/qarraydatapointer.h index 2036120520..b97dde5a61 100644 --- a/src/corelib/tools/qarraydatapointer.h +++ b/src/corelib/tools/qarraydatapointer.h @@ -133,7 +133,7 @@ public: return (!d->isMutable() || d->ref.isShared()); } -#if QT_SUPPORTS(UNSHARABLE_CONTAINERS) +#if !defined(QT_NO_UNSHARABLE_CONTAINERS) void setSharable(bool sharable) { if (needsDetach()) { |