diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-01-21 09:07:49 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-06 08:03:55 +0100 |
| commit | fe3637a70f8d22462a0498b31168a339987d4b9b (patch) | |
| tree | 8f9375724ed05ca99aa94b574ff24fdf894d8b10 | |
| parent | 9e6f0f16ab9d6c5fca1ded90dd6b3feb953712e1 (diff) | |
Remove TableFormat as FormatType from QTextFormat
The enum value is unused, a QTextTableFormat is actually documented
to have a FormatType of FrameFormat, and isTableFormat() etc. do
the right thing.
Task-number: QTBUG-35114
Change-Id: I2f3305630b92f117c1f89b85460457265e5af126
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | src/gui/text/qtextformat.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qtextformat.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index d2b91c1f9f..4854af0d01 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -524,7 +524,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt) \value BlockFormat The object formats a text block \value CharFormat The object formats a single character \value ListFormat The object formats a list - \value TableFormat The object formats a table + \omitvalue TableFormat Unused Value, a table's FormatType is FrameFormat. \value FrameFormat The object formats a frame \value UserFormat diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h index 1906a8a0c2..5369001a03 100644 --- a/src/gui/text/qtextformat.h +++ b/src/gui/text/qtextformat.h @@ -141,7 +141,9 @@ public: BlockFormat = 1, CharFormat = 2, ListFormat = 3, +#if QT_DEPRECATED_SINCE(5, 3) TableFormat = 4, +#endif FrameFormat = 5, UserFormat = 100 |