From a669c33d9c6f42a29d31f493a888ec4fef29bcd8 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Sun, 31 May 2015 17:18:05 +0200
Subject: 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>
---
 src/declarative/util/qdeclarativestyledtext.cpp | 4 ++--
 1 file 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)
-- 
cgit v1.2.3