summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-10-06 16:00:14 +0200
committerLars Knoll <lars.knoll@qt.io>2020-10-12 14:49:50 +0200
commit92b7122eda835537a6bbafb41beb858f38aed538 (patch)
tree50016765154cded7c83ce8b30c2633af76fc0c23 /src/gui
parentfeab484b8d2f879bee4d13aa79998f4961d41804 (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')
-rw-r--r--src/gui/kernel/qpalette.h10
-rw-r--r--src/gui/kernel/qplatformdialoghelper.h3
-rw-r--r--src/gui/text/qplatformfontdatabase.h3
-rw-r--r--src/gui/text/qtextformat.h3
-rw-r--r--src/gui/text/qtextodfwriter.cpp6
5 files changed, 0 insertions, 25 deletions
diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h
index 7724480138..8b291dec58 100644
--- a/src/gui/kernel/qpalette.h
+++ b/src/gui/kernel/qpalette.h
@@ -92,10 +92,6 @@ public:
ToolTipBase, ToolTipText,
PlaceholderText,
NColorRoles = PlaceholderText + 1,
-#if QT_DEPRECATED_SINCE(5, 13)
- Foreground Q_DECL_ENUMERATOR_DEPRECATED_X("Use QPalette::WindowText instead") = WindowText,
- Background Q_DECL_ENUMERATOR_DEPRECATED_X("Use QPalette::Window instead") = Window
-#endif
};
Q_ENUM(ColorRole)
@@ -138,12 +134,6 @@ public:
inline const QBrush &link() const { return brush(Link); }
inline const QBrush &linkVisited() const { return brush(LinkVisited); }
inline const QBrush &placeholderText() const { return brush(PlaceholderText); }
-#if QT_DEPRECATED_SINCE(5, 13)
- QT_DEPRECATED_X("Use QPalette::windowText() instead")
- inline const QBrush &foreground() const { return windowText(); }
- QT_DEPRECATED_X("Use QPalette::window() instead")
- inline const QBrush &background() const { return window(); }
-#endif
bool operator==(const QPalette &p) const;
inline bool operator!=(const QPalette &p) const { return !(operator==(p)); }
diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h
index 080b7c7473..5d1d25a2dd 100644
--- a/src/gui/kernel/qplatformdialoghelper.h
+++ b/src/gui/kernel/qplatformdialoghelper.h
@@ -319,9 +319,6 @@ public:
ShowDirsOnly = 0x00000001,
DontResolveSymlinks = 0x00000002,
DontConfirmOverwrite = 0x00000004,
-#if QT_DEPRECATED_SINCE(5, 14)
- DontUseSheet Q_DECL_ENUMERATOR_DEPRECATED = 0x00000008,
-#endif
DontUseNativeDialog = 0x00000010,
ReadOnly = 0x00000020,
HideNameFilterDetails = 0x00000040,
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
}
}