diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-08-03 08:49:37 +0200 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@qt.io> | 2020-08-06 19:42:11 +0200 |
| commit | 84a1cc9fb76269521456d09abab65c402cf481b7 (patch) | |
| tree | 31ae19f6427685739cedd7b42dbb87d39421622b /src/qml/parser | |
| parent | 139961fc510fc9d26cb2545e54a3f4a3eeb87149 (diff) | |
Fix compilation with newer qtbase
qstrtod is no longer exported, but instead an inline function. This
replaces the existing forward declarations with an include of the
required private header.
Change-Id: I50bd32557c55dddcb197f163609fd7d5a1b2301b
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/qml/parser')
| -rw-r--r-- | src/qml/parser/qqmljslexer.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp index 601596a9e3..c0ff69c6c4 100644 --- a/src/qml/parser/qqmljslexer.cpp +++ b/src/qml/parser/qqmljslexer.cpp @@ -43,16 +43,14 @@ #include <private/qqmljsdiagnosticmessage_p.h> #include <private/qqmljsmemorypool_p.h> +#include <private/qlocale_tools_p.h> + #include <QtCore/qcoreapplication.h> #include <QtCore/qvarlengtharray.h> #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 - using namespace QQmlJS; static inline int regExpFlagFromChar(const QChar &ch) |