From 81117c771c884eb98fa371f8ad50d7564de09d9d Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Sun, 31 May 2015 17:09:44 +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: I6702430c09b30aa033fe4e34f39a9aa3350e471b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
---
 src/quick/util/qquickstyledtext.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/quick/util/qquickstyledtext.cpp')

diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp
index 5efe65ef44..6b1768e9ef 100644
--- a/src/quick/util/qquickstyledtext.cpp
+++ b/src/quick/util/qquickstyledtext.cpp
@@ -182,7 +182,7 @@ void QQuickStyledText::parse(const QString &string, QTextLayout &layout,
 
 void QQuickStyledTextPrivate::parse()
 {
-    QList<QTextLayout::FormatRange> ranges;
+    QVector<QTextLayout::FormatRange> ranges;
     QStack<QTextCharFormat> formatStack;
 
     QString drawText;
@@ -283,7 +283,7 @@ void QQuickStyledTextPrivate::parse()
     }
 
     layout.setText(drawText);
-    layout.setAdditionalFormats(ranges);
+    layout.setFormats(ranges);
 }
 
 void QQuickStyledTextPrivate::appendText(const QString &textIn, int start, int length, QString &textOut)
-- 
cgit v1.2.3