diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2019-05-10 10:51:14 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2019-10-30 16:39:37 +0100 |
| commit | d273076b4474bb473d90e996960c4c773745761a (patch) | |
| tree | aa548cb48203846f6e99691be58863501490736e /src/corelib/tools/qarraydata.h | |
| parent | 7f70a4afa4ba63ffd4f9f989c89220dbf4f77adb (diff) | |
Get rid of unsharable containers
The support for unsharable containers has been deprecated
since Qt 5.3.0, so let's finally remove support for them.
Change-Id: I9be31f55208ae4750e8020b10b6e4ad7e8fb3e0e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/tools/qarraydata.h')
| -rw-r--r-- | src/corelib/tools/qarraydata.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h index 695cc957d6..0063cf046f 100644 --- a/src/corelib/tools/qarraydata.h +++ b/src/corelib/tools/qarraydata.h @@ -78,9 +78,6 @@ struct Q_CORE_EXPORT QArrayData enum AllocationOption { CapacityReserved = 0x1, -#if !defined(QT_NO_UNSHARABLE_CONTAINERS) - Unsharable = 0x2, -#endif RawData = 0x4, Grow = 0x8, @@ -265,14 +262,6 @@ struct QTypedArrayData Q_STATIC_ASSERT(sizeof(QTypedArrayData) == sizeof(QArrayData)); return allocate(/* capacity */ 0); } - -#if !defined(QT_NO_UNSHARABLE_CONTAINERS) - static QTypedArrayData *unsharableEmpty() - { - Q_STATIC_ASSERT(sizeof(QTypedArrayData) == sizeof(QArrayData)); - return allocate(/* capacity */ 0, Unsharable); - } -#endif }; template <class T, size_t N> |