diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-08 13:22:48 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-09 00:49:42 +0200 |
commit | 0f968085b9800dc3d7e25248473bd91c6fffdfa7 (patch) | |
tree | 468835bf389959fb8bea561ec94b778fcf78d847 /src/widgets/kernel/qapplication.cpp | |
parent | 9c551778c8b7932a9bd665b37c8332f1b218cd5a (diff) |
QApplication: remove obsolete keypadNavigationEnabled member
QApplicationPrivate::keypadNavigationEnabled remains, and is
used in many places in QtWidgets.
Change-Id: Id95239560c279850f340f65414acb92202d10367
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/widgets/kernel/qapplication.cpp')
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 91be0d25a4..3f2c15b739 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -1559,7 +1559,7 @@ void QApplicationPrivate::setFocusWidget(QWidget *focus, Qt::FocusReason reason) //send events if (prev) { #ifdef QT_KEYPAD_NAVIGATION - if (QApplication::keypadNavigationEnabled()) { + if (QApplicationPrivate::keyboardNavigationEnabled()) { if (prev->hasEditFocus() && reason != Qt::PopupFocusReason) prev->setEditFocus(false); } @@ -3684,51 +3684,6 @@ 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. - - This feature is available in Qt for Embedded Linux, and Windows CE only. - - \note On Windows CE this feature is disabled by default for touch device - mkspecs. To enable keypad navigation, build Qt with - QT_KEYPAD_NAVIGATION defined. - - \deprecated - - \sa setNavigationMode() -*/ -void QApplication::setKeypadNavigationEnabled(bool enable) -{ - if (enable) { - QApplication::setNavigationMode(Qt::NavigationModeKeypadTabOrder); - } else { - QApplication::setNavigationMode(Qt::NavigationModeNone); - } -} - -/*! - Returns \c true if Qt is set to use keypad navigation; otherwise returns - false. The default value is false. - - This feature is available in Qt for Embedded Linux, and Windows CE only. - - \note On Windows CE this feature is disabled by default for touch device - mkspecs. To enable keypad navigation, build Qt with - QT_KEYPAD_NAVIGATION defined. - - \deprecated - - \sa navigationMode() -*/ -bool QApplication::keypadNavigationEnabled() -{ - return QApplicationPrivate::navigationMode == Qt::NavigationModeKeypadTabOrder || - QApplicationPrivate::navigationMode == Qt::NavigationModeKeypadDirectional; -} -# endif #endif /*! |