diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-12 20:36:14 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-12 20:36:48 +0200 |
commit | 880a143eb572de3e8a6734cc663ed4b6e309b99d (patch) | |
tree | 4d1ad149dff7d9708e5981ea7b0ec7f8aee24bbf /src/qml/memory | |
parent | c433b78660923b6268653b437a2a04078de0f058 (diff) | |
parent | a6057b46eebc71772d584ea5d318d130e2f40a19 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I4476733af61fcf3a2af1d121a4585c3fae1c240e
Diffstat (limited to 'src/qml/memory')
-rw-r--r-- | src/qml/memory/qv4mm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp index 6ee36cbfcf..3465036c86 100644 --- a/src/qml/memory/qv4mm.cpp +++ b/src/qml/memory/qv4mm.cpp @@ -46,6 +46,7 @@ #include <QtCore/qalgorithms.h> #include <QtCore/private/qnumeric_p.h> #include <QtCore/qloggingcategory.h> +#include <private/qv4alloca_p.h> #include <qqmlengine.h> #include "PageReservation.h" #include "PageAllocation.h" @@ -59,7 +60,6 @@ #include <iostream> #include <cstdlib> #include <algorithm> -#include "qv4alloca_p.h" #include "qv4profiling_p.h" #include "qv4mapobject_p.h" #include "qv4setobject_p.h" |