summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextformat.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-01-21 09:07:49 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-06 08:03:55 +0100
commitfe3637a70f8d22462a0498b31168a339987d4b9b (patch)
tree8f9375724ed05ca99aa94b574ff24fdf894d8b10 /src/gui/text/qtextformat.h
parent9e6f0f16ab9d6c5fca1ded90dd6b3feb953712e1 (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>
Diffstat (limited to 'src/gui/text/qtextformat.h')
-rw-r--r--src/gui/text/qtextformat.h2
1 files changed, 2 insertions, 0 deletions
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