1 files changed, 10 insertions, 6 deletions
diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h
index 10a9e35542..dd2b777ed7 100644
--- a/src/corelib/tools/qarraydata.h
+++ b/src/corelib/tools/qarraydata.h
@@ -101,10 +101,6 @@ 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;
@@ -120,9 +116,9 @@ struct Q_CORE_EXPORT QArrayData
 
     static QArrayData *allocate(size_t objectSize, size_t alignment,
             size_t capacity, AllocationOptions options = Default)
-        Q_REQUIRED_RESULT;
+        Q_DECL_NOTHROW Q_REQUIRED_RESULT;
     static void deallocate(QArrayData *data, size_t objectSize,
-            size_t alignment);
+            size_t alignment) Q_DECL_NOTHROW;
 
     static const QArrayData shared_null[2];
     static QArrayData *sharedNull() { return const_cast<QArrayData*>(shared_null); }
@@ -361,6 +357,14 @@ namespace QtPrivate {
     QT_PREPEND_NAMESPACE(QtPrivate::qMakeArrayLiteral)<Type>( Array )
 #endif // !defined(Q_ARRAY_LITERAL)
 
+namespace QtPrivate {
+struct Q_CORE_EXPORT QContainerImplHelper
+{
+    enum CutResult { Null, Empty, Full, Subset };
+    static CutResult mid(int originalLength, int *position, int *length);
+};
+}
+
 QT_END_NAMESPACE
 
 #endif // include guard