diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2014-08-04 23:28:47 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-04 06:03:59 +0000 |
| commit | 861dca57d72260049b21ccace2e702703ec342b8 (patch) | |
| tree | 28d8fb9d7f9b88fee82ea3d754e193d50b7ef924 /src/gui/text/qtextlayout.h | |
| parent | 9cb68cdea0fbf646315d972d8926b8d55c87cb02 (diff) | |
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>
Diffstat (limited to 'src/gui/text/qtextlayout.h')
| -rw-r--r-- | src/gui/text/qtextlayout.h | 8 |
1 files changed, 5 insertions, 3 deletions
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(); |