diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-17 20:09:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-17 20:09:49 +0200 |
| commit | 9c9fca5e27bd91da1ea07bebd7569049493c5ccf (patch) | |
| tree | dd3b49b40ed01cad1c2cdc206ec73271bca6e942 /src/qml/memory | |
| parent | 94e337fa95425d259e81b4d21f4d0853108553bd (diff) | |
| parent | 668ccf18dc8d5ddf403667f19a5b08f2b7c18639 (diff) | |
Merge dev into 5.6
Change-Id: I9ec05838f3c4cbc11fb969c71daf5c2a5a8df360
Diffstat (limited to 'src/qml/memory')
| -rw-r--r-- | src/qml/memory/qv4mm.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp index 24be663ed7..03e78df91a 100644 --- a/src/qml/memory/qv4mm.cpp +++ b/src/qml/memory/qv4mm.cpp @@ -275,7 +275,6 @@ Heap::Base *MemoryManager::allocData(std::size_t size) Q_V4_PROFILE_ALLOC(m_d->engine, allocSize, Profiling::HeapPage), OSAllocator::JSGCHeapPages); m_d->heapChunks.append(allocation); - std::sort(m_d->heapChunks.begin(), m_d->heapChunks.end()); header = reinterpret_cast<Data::ChunkHeader *>(allocation.base()); header->itemSize = int(size); |