diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-10-06 16:00:14 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-10-12 14:49:50 +0200 |
| commit | 92b7122eda835537a6bbafb41beb858f38aed538 (patch) | |
| tree | 50016765154cded7c83ce8b30c2633af76fc0c23 /src/gui/text | |
| parent | feab484b8d2f879bee4d13aa79998f4961d41804 (diff) | |
Remove dead code
This code has been deprecated in Qt 5.
Change-Id: Ia8e0bc791ac1f43df7124b4f30db3d0bb9966015
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qplatformfontdatabase.h | 3 | ||||
| -rw-r--r-- | src/gui/text/qtextformat.h | 3 | ||||
| -rw-r--r-- | src/gui/text/qtextodfwriter.cpp | 6 |
3 files changed, 0 insertions, 12 deletions
diff --git a/src/gui/text/qplatformfontdatabase.h b/src/gui/text/qplatformfontdatabase.h index e464855bfd..74b9e1ba12 100644 --- a/src/gui/text/qplatformfontdatabase.h +++ b/src/gui/text/qplatformfontdatabase.h @@ -54,9 +54,6 @@ #include <QtCore/QString> #include <QtCore/QStringList> #include <QtCore/QList> -#if QT_DEPRECATED_SINCE(5, 5) -#include <QtCore/QHash> -#endif #include <QtGui/QFontDatabase> #include <QtGui/private/qfontengine_p.h> #include <QtGui/private/qfont_p.h> diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h index 71ad97a635..e1668f8362 100644 --- a/src/gui/text/qtextformat.h +++ b/src/gui/text/qtextformat.h @@ -141,9 +141,6 @@ public: BlockFormat = 1, CharFormat = 2, ListFormat = 3, -#if QT_DEPRECATED_SINCE(5, 3) - TableFormat = 4, -#endif FrameFormat = 5, UserFormat = 100 diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp index 953c05c74c..df25162a89 100644 --- a/src/gui/text/qtextodfwriter.cpp +++ b/src/gui/text/qtextodfwriter.cpp @@ -547,12 +547,6 @@ void QTextOdfWriter::writeFormats(QXmlStreamWriter &writer, const QSet<int> &for else writeFrameFormat(writer, textFormat.toFrameFormat(), formatIndex); break; -#if QT_DEPRECATED_SINCE(5, 3) - case QTextFormat::TableFormat: - // this case never happens, because TableFormat is a FrameFormat - Q_UNREACHABLE(); - break; -#endif } } |