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 | |
| 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>
| -rw-r--r-- | src/qml/parser/qqmljslexer.cpp | 6 | ||||
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 3 | ||||
| -rw-r--r-- | src/quick/util/qquicksvgparser.cpp | 4 |
3 files changed, 5 insertions, 8 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) diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index d705d08f71..5a7af4835e 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -68,6 +68,7 @@ #include <private/qv4functionobject_p.h> #include <private/qv4objectproto_p.h> #include <private/qv4scopedvalue_p.h> +#include <private/qlocale_tools_p.h> #include <QtCore/qmath.h> #include <QtCore/qvector.h> @@ -124,8 +125,6 @@ QT_BEGIN_NAMESPACE -Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); - #define CHECK_CONTEXT(r) if (!r || !r->d()->context() || !r->d()->context()->bufferValid()) \ THROW_GENERIC_ERROR("Not a Context2D object"); diff --git a/src/quick/util/qquicksvgparser.cpp b/src/quick/util/qquicksvgparser.cpp index 0687913565..3e783b26a8 100644 --- a/src/quick/util/qquicksvgparser.cpp +++ b/src/quick/util/qquicksvgparser.cpp @@ -43,10 +43,10 @@ #include <QtCore/qvarlengtharray.h> #include <QtCore/qstring.h> +#include <private/qlocale_tools_p.h> + QT_BEGIN_NAMESPACE -//copied from Qt SVG (qsvghandler.cpp). -Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); // '0' is 0x30 and '9' is 0x39 static inline bool isDigit(ushort ch) { |