From 48b4c1f450109b148f03f62574d78b460859c4a1 Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Mon, 17 Aug 2020 10:59:47 +0200
Subject: Adapt to qtbase changes

The internal QVariant constructor taking a QMetaTypeId has been removed.
Thus, construct QMetaTypes where necessary from the id, or avoid a
QMetaType -> ID -> QMetaType roundtrip where we already have a metatype.
Also fix a few missing includse that were previously transitively
included.

Change-Id: I56ce92281d616108a4ff80fe5052b919d1282357
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
---
 src/qml/parser/qqmljsast.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/qml/parser/qqmljsast.cpp')

diff --git a/src/qml/parser/qqmljsast.cpp b/src/qml/parser/qqmljsast.cpp
index f1f6102297..9885875499 100644
--- a/src/qml/parser/qqmljsast.cpp
+++ b/src/qml/parser/qqmljsast.cpp
@@ -37,6 +37,7 @@
 **
 ****************************************************************************/
 
+#include <QLocale>
 #include "qqmljsast_p.h"
 
 #include "qqmljsastvisitor_p.h"
-- 
cgit v1.2.3