diff options
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 } } |