diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 13:05:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 13:08:42 +0200 |
| commit | ccc6efb6e91756451ffd50d51f7f3ae05bc6df0b (patch) | |
| tree | a65fb418e4e0ce27e6cd73f65500e7cc00bbf106 /src/corelib/tools/qcontiguouscache.h | |
| parent | d52b00e1d3cc60c81b54a89d6da488dc4bbce384 (diff) | |
| parent | 079f2bf5d8a4221b821ec8062affe2efaa9668a0 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
This merge adds the opengl rename.
Change-Id: I84ea0b6abee9780ebb2cf3f64ab9e3fdf2acab3e
Diffstat (limited to 'src/corelib/tools/qcontiguouscache.h')
| -rw-r--r-- | src/corelib/tools/qcontiguouscache.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qcontiguouscache.h b/src/corelib/tools/qcontiguouscache.h index d601ddb819..e05ef33aa2 100644 --- a/src/corelib/tools/qcontiguouscache.h +++ b/src/corelib/tools/qcontiguouscache.h @@ -104,7 +104,9 @@ public: inline void detach() { if (d->ref.load() != 1) detach_helper(); } inline bool isDetached() const { return d->ref.load() == 1; } +#if QT_SUPPORTS(UNSHARABLE_CONTAINERS) inline void setSharable(bool sharable) { if (!sharable) detach(); d->sharable = sharable; } +#endif QContiguousCache<T> &operator=(const QContiguousCache<T> &other); #ifdef Q_COMPILER_RVALUE_REFS |