From 861dca57d72260049b21ccace2e702703ec342b8 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Mon, 4 Aug 2014 23:28:47 +0200
Subject: QTextLayout: deprecate QList API for additionalFormat

This is a separate commit to allow other modules to do the transition
before this may vanish or cause a warning.

Change-Id: I556837bf0d2c667f067f4e1fa7918bd1a3f55025
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 src/gui/text/qtextlayout.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/gui/text/qtextlayout.h')

diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h
index 9709af4fd1..3f427384ab 100644
--- a/src/gui/text/qtextlayout.h
+++ b/src/gui/text/qtextlayout.h
@@ -131,9 +131,11 @@ public:
         friend bool operator!=(const FormatRange &lhs, const FormatRange &rhs)
         { return !operator==(lhs, rhs); }
     };
-    void setAdditionalFormats(const QList<FormatRange> &overrides);
-    QList<FormatRange> additionalFormats() const;
-    void clearAdditionalFormats();
+#if QT_DEPRECATED_SINCE(5, 6)
+    QT_DEPRECATED_X("Use setFormats()") void setAdditionalFormats(const QList<FormatRange> &overrides);
+    QT_DEPRECATED_X("Use formats()") QList<FormatRange> additionalFormats() const;
+    QT_DEPRECATED_X("Use clearFormats()") void clearAdditionalFormats();
+#endif
     void setFormats(const QVector<FormatRange> &overrides);
     QVector<FormatRange> formats() const;
     void clearFormats();
-- 
cgit v1.2.3