1 files changed, 31 insertions, 2 deletions
diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp
index 12736d5c2e..4047bf611f 100644
--- a/src/corelib/tools/qarraydata.cpp
+++ b/src/corelib/tools/qarraydata.cpp
@@ -68,7 +68,7 @@ static const QArrayData &qt_array_empty = qt_array[0];
 static const QArrayData &qt_array_unsharable_empty = qt_array[1];
 
 QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment,
-        size_t capacity, AllocationOptions options)
+        size_t capacity, AllocationOptions options) Q_DECL_NOTHROW
 {
     // Alignment is a power of two
     Q_ASSERT(alignment >= Q_ALIGNOF(QArrayData)
@@ -114,7 +114,7 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment,
 }
 
 void QArrayData::deallocate(QArrayData *data, size_t objectSize,
-        size_t alignment)
+        size_t alignment) Q_DECL_NOTHROW
 {
     // Alignment is a power of two
     Q_ASSERT(alignment >= Q_ALIGNOF(QArrayData)
@@ -130,4 +130,33 @@ void QArrayData::deallocate(QArrayData *data, size_t objectSize,
     ::free(data);
 }
 
+namespace QtPrivate {
+/*!
+  \internal
+*/
+QContainerImplHelper::CutResult QContainerImplHelper::mid(int originalLength, int *_position, int *_length)
+{
+    int &position = *_position;
+    int &length = *_length;
+    if (position > originalLength)
+        return Null;
+
+    if (position < 0) {
+        if (length < 0 || length + position >= originalLength)
+            return Full;
+        if (length + position <= 0)
+            return Null;
+        length += position;
+        position = 0;
+    } else if (uint(length) > uint(originalLength - position)) {
+        length = originalLength - position;
+    }
+
+    if (position == 0 && length == originalLength)
+        return Full;
+
+    return length > 0 ? Subset : Empty;
+}
+}
+
 QT_END_NAMESPACE