From 149cc3af6bb77d6af515459cb2cde3fd5672e23b Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 6 Aug 2020 18:03:03 -0700
Subject: [PATCH] Fix build with Qt 6: qstrtod is an inline function

Change-Id: Ib620871532484bcaa43cfffd1628d6bf0f93fd78
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: hjk <hjk@qt.io>
---
 src/libs/qmljs/parser/qmljslexer.cpp | 4 +---
 src/libs/qmljs/qmljs-lib.pri         | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp
index 97f33bdda60..32bd86c592a 100644
--- a/src/libs/qmljs/parser/qmljslexer.cpp
+++ b/src/libs/qmljs/parser/qmljslexer.cpp
@@ -35,9 +35,7 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/QScopedValueRollback>
 
-QT_BEGIN_NAMESPACE
-Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
-QT_END_NAMESPACE
+#include <QtCore/private/qlocale_tools_p.h>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/libs/qmljs/qmljs-lib.pri b/src/libs/qmljs/qmljs-lib.pri
index c9800eab810..5c14ef9da31 100644
--- a/src/libs/qmljs/qmljs-lib.pri
+++ b/src/libs/qmljs/qmljs-lib.pri
@@ -84,4 +84,4 @@ contains(QT, gui) {
         $$PWD/qmljsreformatter.h
 }
 
-QT += xml
+QT += xml core-private