3 files changed, 13 insertions, 2 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 5b2f708bcd..f8f24d1ff0 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -3908,6 +3908,7 @@ Qt::NavigationMode QApplication::navigationMode()
     return QApplicationPrivate::navigationMode;
 }
 
+# if QT_DEPRECATED_SINCE(5, 13)
 /*!
     Sets whether Qt should use focus navigation suitable for use with a
     minimal keypad.
@@ -3950,6 +3951,7 @@ bool QApplication::keypadNavigationEnabled()
     return QApplicationPrivate::navigationMode == Qt::NavigationModeKeypadTabOrder ||
         QApplicationPrivate::navigationMode == Qt::NavigationModeKeypadDirectional;
 }
+# endif
 #endif
 
 /*!
diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h
index 7a5d7ba1a9..27e743a28d 100644
--- a/src/widgets/kernel/qapplication.h
+++ b/src/widgets/kernel/qapplication.h
@@ -180,8 +180,12 @@ public:
     bool notify(QObject *, QEvent *) override;
 
 #ifdef QT_KEYPAD_NAVIGATION
-    static Q_DECL_DEPRECATED void setKeypadNavigationEnabled(bool);
-    static bool keypadNavigationEnabled();
+# if QT_DEPRECATED_SINCE(5, 13)
+    static QT_DEPRECATED_X ("Use QApplication::setNavigationMode() instead")
+    void setKeypadNavigationEnabled(bool);
+    static QT_DEPRECATED_X ("Use QApplication::navigationMode() instead")
+    bool keypadNavigationEnabled();
+# endif
     static void setNavigationMode(Qt::NavigationMode mode);
     static Qt::NavigationMode navigationMode();
 #endif
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
index 9d5fe89c70..4e5ef5a111 100644
--- a/src/widgets/kernel/qwidget.h
+++ b/src/widgets/kernel/qwidget.h
@@ -235,7 +235,10 @@ public:
 
     bool isEnabled() const;
     bool isEnabledTo(const QWidget *) const;
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X ("Use isEnabled() instead")
     bool isEnabledToTLW() const;
+#endif
 
 public Q_SLOTS:
     void setEnabled(bool);
@@ -769,8 +772,10 @@ inline bool QWidget::isEnabled() const
 inline bool QWidget::isModal() const
 { return data->window_modality != Qt::NonModal; }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 inline bool QWidget::isEnabledToTLW() const
 { return isEnabled(); }
+#endif
 
 inline int QWidget::minimumWidth() const
 { return minimumSize().width(); }