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/parser/qqmljslexer.cpp | |
| parent | c433b78660923b6268653b437a2a04078de0f058 (diff) | |
| parent | a6057b46eebc71772d584ea5d318d130e2f40a19 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I4476733af61fcf3a2af1d121a4585c3fae1c240e
Diffstat (limited to 'src/qml/parser/qqmljslexer.cpp')
| -rw-r--r-- | src/qml/parser/qqmljslexer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp index 165925d2a2..1e0ac72bd1 100644 --- a/src/qml/parser/qqmljslexer.cpp +++ b/src/qml/parser/qqmljslexer.cpp @@ -39,10 +39,10 @@ #include "qqmljslexer_p.h" #include "qqmljsengine_p.h" -#include "qqmljsmemorypool_p.h" #include "qqmljskeywords_p.h" #include <private/qqmljsdiagnosticmessage_p.h> +#include <private/qqmljsmemorypool_p.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qvarlengtharray.h> |