1 files changed, 44 insertions, 0 deletions
diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp
index 3b15c0e246..168249c074 100644
--- a/src/corelib/tools/qarraydata.cpp
+++ b/src/corelib/tools/qarraydata.cpp
@@ -46,4 +46,48 @@ QT_BEGIN_NAMESPACE
 const QArrayData QArrayData::shared_null = { Q_REFCOUNT_INITIALIZER(-1), 0, 0, 0, 0 };
 const QArrayData QArrayData::shared_empty = { Q_REFCOUNT_INITIALIZER(-1), 0, 0, 0, 0 };
 
+QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment,
+        size_t capacity, bool reserve)
+{
+    // Alignment is a power of two
+    Q_ASSERT(alignment >= Q_ALIGNOF(QArrayData)
+            && !(alignment & (alignment - 1)));
+
+    // Don't allocate empty headers
+    if (!capacity)
+        return const_cast<QArrayData *>(&shared_empty);
+
+    // Allocate extra (alignment - Q_ALIGNOF(QArrayData)) padding bytes so we
+    // can properly align the data array. This assumes malloc is able to
+    // provide appropriate alignment for the header -- as it should!
+    size_t allocSize = sizeof(QArrayData) + objectSize * capacity
+        + (alignment - Q_ALIGNOF(QArrayData));
+
+    QArrayData *header = static_cast<QArrayData *>(qMalloc(allocSize));
+    Q_CHECK_PTR(header);
+    if (header) {
+        quintptr data = (quintptr(header) + sizeof(QArrayData) + alignment - 1)
+                & ~(alignment - 1);
+
+        header->ref = 1;
+        header->size = 0;
+        header->alloc = capacity;
+        header->capacityReserved = reserve;
+        header->offset = data - quintptr(header);
+    }
+
+    return header;
+}
+
+void QArrayData::deallocate(QArrayData *data, size_t objectSize,
+        size_t alignment)
+{
+    // Alignment is a power of two
+    Q_ASSERT(alignment >= Q_ALIGNOF(QArrayData)
+            && !(alignment & (alignment - 1)));
+    Q_UNUSED(objectSize) Q_UNUSED(alignment)
+
+    qFree(data);
+}
+
 QT_END_NAMESPACE