aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/parser
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2016-04-05 13:58:20 +0200
committerErik Verbruggen <erik.verbruggen@theqtcompany.com>2016-04-05 13:49:27 +0000
commitf63f86f7d38a182b41a85af27bf0baba3db03941 (patch)
treebc9ebff4b5e0591c106b1bb47b1a1111224a1962 /src/qml/parser
parent7c18dcf79abbcc4de085e73ca7abe4eeeb7f140c (diff)
Replace qQNaN() and friends with qt_qnan().
These constexpr functions can be inlined, and the compiler can be a bit smarter with code generation. Change-Id: I4ea87c794dd8e375749e18d273d01bb848231113 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/qml/parser')
-rw-r--r--src/qml/parser/qqmljsengine_p.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/parser/qqmljsengine_p.cpp b/src/qml/parser/qqmljsengine_p.cpp
index d3b3af317c..07064a4889 100644
--- a/src/qml/parser/qqmljsengine_p.cpp
+++ b/src/qml/parser/qqmljsengine_p.cpp
@@ -40,7 +40,7 @@
#include "qqmljsengine_p.h"
#include "qqmljsglobal_p.h"
-#include <QtCore/qnumeric.h>
+#include <QtCore/private/qnumeric_p.h>
#include <QtCore/qhash.h>
#include <QtCore/qdebug.h>
@@ -62,7 +62,7 @@ static inline int toDigit(char c)
double integerFromString(const char *buf, int size, int radix)
{
if (size == 0)
- return qQNaN();
+ return qt_qnan();
double sign = 1.0;
int i = 0;
@@ -101,7 +101,7 @@ double integerFromString(const char *buf, int size, int radix)
if (!qstrcmp(buf, "Infinity"))
result = qInf();
else
- result = qQNaN();
+ result = qt_qnan();
} else {
result = 0;
double multiplier = 1;