1 files changed, 22 insertions, 27 deletions

diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index 0b52747b6a..8b54d61e8e 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -223,7 +223,7 @@ void QComboBoxPrivate::_q_completerActivated(const QModelIndex &index)
     }
 
 #  ifdef QT_KEYPAD_NAVIGATION
-    if ( QApplication::keypadNavigationEnabled()
+    if ( QApplicationPrivate::keypadNavigationEnabled()
          && q->isEditable()
          && q->completer()
          && q->completer()->completionMode() == QCompleter::UnfilteredPopupCompletion ) {
@@ -896,11 +896,6 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
     \fn void QComboBox::currentIndexChanged(const QString &text)
     \since 4.1
 
-    \obsolete
-
-    Use currentTextChanged(const QString &) or currentIndexChanged(int)
-    instead.
-
     This signal is sent whenever the currentIndex in the combobox
     changes either through user interaction or programmatically.  The
     item's \a text is passed.
@@ -1539,7 +1534,7 @@ void QComboBox::setAutoCompletion(bool enable)
     Q_D(QComboBox);
 
 #ifdef QT_KEYPAD_NAVIGATION
-    if (Q_UNLIKELY(QApplication::keypadNavigationEnabled() && !enable && isEditable()))
+    if (Q_UNLIKELY(QApplicationPrivate::keypadNavigationEnabled() && !enable && isEditable()))
         qWarning("QComboBox::setAutoCompletion: auto completion is mandatory when combo box editable");
 #endif
 
@@ -1886,7 +1881,7 @@ void QComboBox::setLineEdit(QLineEdit *edit)
     setAutoCompletion(d->autoCompletion);
 
 #ifdef QT_KEYPAD_NAVIGATION
-    if (QApplication::keypadNavigationEnabled()) {
+    if (QApplicationPrivate::keypadNavigationEnabled()) {
         // Editable combo boxes will have a completer that is set to UnfilteredPopupCompletion.
         // This means that when the user enters edit mode they are immediately presented with a
         // list of possible completions.
@@ -2628,7 +2623,7 @@ bool QComboBoxPrivate::showNativePopup()
 
 /*!
     Displays the list of items in the combobox. If the list is empty
-    then the no items will be shown.
+    then no items will be shown.
 
     If you reimplement this function to show a custom pop-up, make
     sure you call hidePopup() to reset the internal state.
@@ -2658,7 +2653,7 @@ void QComboBox::showPopup()
 
 #ifdef QT_KEYPAD_NAVIGATION
 #if QT_CONFIG(completer)
-    if (QApplication::keypadNavigationEnabled() && d->completer) {
+    if (QApplicationPrivate::keypadNavigationEnabled() && d->completer) {
         // editable combo box is line edit plus completer
         setEditFocus(true);
         d->completer->complete(); // show popup
@@ -2719,15 +2714,14 @@ void QComboBox::showPopup()
         int heightMargin = container->topMargin()  + container->bottomMargin();
 
         // add the frame of the container
-        int marginTop, marginBottom;
-        container->getContentsMargins(0, &marginTop, 0, &marginBottom);
-        heightMargin += marginTop + marginBottom;
+        const QMargins cm = container->contentsMargins();
+        heightMargin += cm.top() + cm.bottom();
 
         //add the frame of the view
-        view()->getContentsMargins(0, &marginTop, 0, &marginBottom);
-        marginTop += static_cast<QAbstractScrollAreaPrivate *>(QObjectPrivate::get(view()))->top;
-        marginBottom += static_cast<QAbstractScrollAreaPrivate *>(QObjectPrivate::get(view()))->bottom;
-        heightMargin += marginTop + marginBottom;
+        const QMargins vm = view()->contentsMargins();
+        heightMargin += vm.top() + vm.bottom();
+        heightMargin += static_cast<QAbstractScrollAreaPrivate *>(QObjectPrivate::get(view()))->top;
+        heightMargin += static_cast<QAbstractScrollAreaPrivate *>(QObjectPrivate::get(view()))->bottom;
 
         listRect.setHeight(listRect.height() + heightMargin);
     }
@@ -2864,7 +2858,7 @@ void QComboBox::showPopup()
 
     container->update();
 #ifdef QT_KEYPAD_NAVIGATION
-    if (QApplication::keypadNavigationEnabled())
+    if (QApplicationPrivate::keypadNavigationEnabled())
         view()->setEditFocus(true);
 #endif
     if (startTimer) {
@@ -2936,7 +2930,7 @@ void QComboBox::hidePopup()
             d->container->hide();
     }
 #ifdef QT_KEYPAD_NAVIGATION
-    if (QApplication::keypadNavigationEnabled() && isEditable() && hasFocus())
+    if (QApplicationPrivate::keypadNavigationEnabled() && isEditable() && hasFocus())
         setEditFocus(true);
 #endif
     d->_q_resetButton();
@@ -3195,7 +3189,7 @@ void QComboBoxPrivate::showPopupFromMouseEvent(QMouseEvent *e)
         }
     } else {
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled() && sc == QStyle::SC_ComboBoxEditField && lineEdit) {
+        if (QApplicationPrivate::keypadNavigationEnabled() && sc == QStyle::SC_ComboBoxEditField && lineEdit) {
             lineEdit->event(e);  //so lineedit can move cursor, etc
             return;
         }
@@ -3244,7 +3238,7 @@ void QComboBox::keyPressEvent(QKeyEvent *e)
         Q_FALLTHROUGH();
     case Qt::Key_PageUp:
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled())
+        if (QApplicationPrivate::keypadNavigationEnabled())
             e->ignore();
         else
 #endif
@@ -3259,7 +3253,7 @@ void QComboBox::keyPressEvent(QKeyEvent *e)
         Q_FALLTHROUGH();
     case Qt::Key_PageDown:
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled())
+        if (QApplicationPrivate::keypadNavigationEnabled())
             e->ignore();
         else
 #endif
@@ -3293,7 +3287,7 @@ void QComboBox::keyPressEvent(QKeyEvent *e)
         break;
 #ifdef QT_KEYPAD_NAVIGATION
     case Qt::Key_Select:
-        if (QApplication::keypadNavigationEnabled()
+        if (QApplicationPrivate::keypadNavigationEnabled()
                 && (!hasEditFocus() || !d->lineEdit)) {
             showPopup();
             return;
@@ -3301,11 +3295,11 @@ void QComboBox::keyPressEvent(QKeyEvent *e)
         break;
     case Qt::Key_Left:
     case Qt::Key_Right:
-        if (QApplication::keypadNavigationEnabled() && !hasEditFocus())
+        if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus())
             e->ignore();
         break;
     case Qt::Key_Back:
-        if (QApplication::keypadNavigationEnabled()) {
+        if (QApplicationPrivate::keypadNavigationEnabled()) {
             if (!hasEditFocus() || !d->lineEdit)
                 e->ignore();
         } else {
@@ -3383,12 +3377,13 @@ void QComboBox::wheelEvent(QWheelEvent *e)
         !d->viewContainer()->isVisible()) {
         const int rowCount = count();
         int newIndex = currentIndex();
+        int delta = e->angleDelta().y();
 
-        if (e->delta() > 0) {
+        if (delta > 0) {
             newIndex--;
             while ((newIndex >= 0) && !(d->model->flags(d->model->index(newIndex,d->modelColumn,d->root)) & Qt::ItemIsEnabled))
                 newIndex--;
-        } else if (e->delta() < 0) {
+        } else if (delta < 0) {
             newIndex++;
             while (newIndex < rowCount && !(d->model->index(newIndex, d->modelColumn, d->root).flags() & Qt::ItemIsEnabled))
                 newIndex++;