diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-05-31 17:18:05 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-06-07 07:14:04 +0000 |
| commit | a669c33d9c6f42a29d31f493a888ec4fef29bcd8 (patch) | |
| tree | 9706085c1c16bc770ca447cf021f8710b6846679 | |
| parent | 5b6a81d8349c2cdff7787de7aaa396722bc60420 (diff) | |
Fix users of QTextLayout::additionalFormats to use the new API
QTextLayout::additionalFormats setters and getters using QList<FormatRange> have
been deprecated; port to the QVector versions.
Change-Id: If2a7d14c0c2e15099957135d565794b880d2ba80
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
| -rw-r--r-- | src/declarative/util/qdeclarativestyledtext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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) |