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/qarraydata.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/qarraydata.h')
-rw-r--r-- | src/corelib/tools/qarraydata.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h index ffb2b8765e..10a9e35542 100644 --- a/src/corelib/tools/qarraydata.h +++ b/src/corelib/tools/qarraydata.h @@ -80,7 +80,9 @@ struct Q_CORE_EXPORT QArrayData enum AllocationOption { CapacityReserved = 0x1, +#if QT_SUPPORTS(UNSHARABLE_CONTAINERS) Unsharable = 0x2, +#endif RawData = 0x4, Grow = 0x8, @@ -99,8 +101,10 @@ struct Q_CORE_EXPORT QArrayData AllocationOptions detachFlags() const { AllocationOptions result; +#if QT_SUPPORTS(UNSHARABLE_CONTAINERS) if (!ref.isSharable()) result |= Unsharable; +#endif if (capacityReserved) result |= CapacityReserved; return result; |