AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QComboBox: remove dead keyboard-navigation code

Browse Source 
The code called setEditFocus, which no longer exists anywhere in Qt.

Change-Id: Icd02b8d8b204819188e090e7462309e5c5a5b3d6
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
Volker Hilsheimer 2022-08-26 18:00:55 +02:00
parent ffb9dee1b0
commit ad80533473
1 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/widgets/widgets/qcombobox.cpp
View File

@ -226,15 +226,6 @@ void QComboBoxPrivate::_q_completerActivated(const QModelIndex &index)
}
}
#endif
# ifdef QT_KEYPAD_NAVIGATION
if ( QApplicationPrivate::keypadNavigationEnabled()
&& q->isEditable()
&& q->completer()
&& q->completer()->completionMode() == QCompleter::UnfilteredPopupCompletion ) {
q->setEditFocus(false);
}
# endif // QT_KEYPAD_NAVIGATION
}
#endif // QT_CONFIG(completer)
@ -2568,17 +2559,6 @@ void QComboBox::showPopup()
return;
#endif // Q_OS_MAC
#ifdef QT_KEYPAD_NAVIGATION
#if QT_CONFIG(completer)
if (QApplicationPrivate::keypadNavigationEnabled() && d->completer) {
// editable combo box is line edit plus completer
setEditFocus(true);
d->completer->complete(); // show popup
return;
}
#endif
#endif
// set current item and select it
QItemSelectionModel::SelectionFlags selectionMode = QItemSelectionModel::ClearAndSelect;
if (view()->selectionBehavior() == QAbstractItemView::SelectRows)
@ -2783,10 +2763,6 @@ void QComboBox::showPopup()
#endif
container->update();
#ifdef QT_KEYPAD_NAVIGATION
if (QApplicationPrivate::keypadNavigationEnabled())
view()->setEditFocus(true);
#endif
if (startTimer) {
container->popupTimer.start();
container->maybeIgnoreMouseButtonRelease = true;
@ -2855,11 +2831,6 @@ void QComboBoxPrivate::doHidePopup()
if (container && container->isVisible())
container->hide();
#ifdef QT_KEYPAD_NAVIGATION
if (QApplicationPrivate::keypadNavigationEnabled() && isEditable() && hasFocus())
setEditFocus(true);
#endif
_q_resetButton();
}
@ -3066,9 +3037,7 @@ bool QComboBox::event(QEvent *event)
break;
#ifdef QT_KEYPAD_NAVIGATION
case QEvent::EnterEditFocus:
if (!d->lineEdit)
setEditFocus(false); // We never want edit focus if we are not editable
else
if (d->lineEdit)
d->lineEdit->event(event); //so cursor starts
break;
case QEvent::LeaveEditFocus: