diff options
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/parser/qdeclarativejslexer.cpp | 6 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativestyledtext.cpp | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejslexer.cpp b/src/declarative/qml/parser/qdeclarativejslexer.cpp index 9ca71010..fa16c78c 100644 --- a/src/declarative/qml/parser/qdeclarativejslexer.cpp +++ b/src/declarative/qml/parser/qdeclarativejslexer.cpp @@ -48,10 +48,6 @@ #include <stdio.h> #include <string.h> -QT_BEGIN_NAMESPACE -Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); -QT_END_NAMESPACE - QT_QML_BEGIN_NAMESPACE #define shiftWindowsLineBreak() \ @@ -819,7 +815,7 @@ int Lexer::lex() double dval = 0; if (state == Number) { - dval = qstrtod(buffer8, 0, 0); + dval = QByteArray::fromRawData(buffer8, pos8).toDouble(); } else if (state == Hex) { // scan hex numbers dval = integerFromString(buffer8, pos8, 16); state = Number; diff --git a/src/declarative/util/qdeclarativestyledtext.cpp b/src/declarative/util/qdeclarativestyledtext.cpp index 6fb37625..4fb68831 100644 --- a/src/declarative/util/qdeclarativestyledtext.cpp +++ b/src/declarative/util/qdeclarativestyledtext.cpp @@ -111,7 +111,7 @@ void QDeclarativeStyledText::parse(const QString &string, QTextLayout &layout) void QDeclarativeStyledTextPrivate::parse() { - QList<QTextLayout::FormatRange> ranges; + QVector<QTextLayout::FormatRange> ranges; QStack<QTextCharFormat> formatStack; QString drawText; @@ -172,7 +172,7 @@ void QDeclarativeStyledTextPrivate::parse() } layout.setText(drawText); - layout.setAdditionalFormats(ranges); + layout.setFormats(ranges); } bool QDeclarativeStyledTextPrivate::parseTag(const QChar *&ch, const QString &textIn, QString &textOut, QTextCharFormat &format) |