8 files changed, 31 insertions, 20 deletions

diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp
index ad7a82518e..41d4fc925a 100644
--- a/src/widgets/graphicsview/qgraphicsscene.cpp
+++ b/src/widgets/graphicsview/qgraphicsscene.cpp
@@ -4147,8 +4147,9 @@ void QGraphicsScene::wheelEvent(QGraphicsSceneWheelEvent *wheelEvent)
                                                             wheelEvent->widget()));
         wheelEvent->accept();
         bool isPanel = item->isPanel();
-        d->sendEvent(item, wheelEvent);
-        if (isPanel || wheelEvent->isAccepted())
+        bool ret = d->sendEvent(item, wheelEvent);
+
+        if (ret && (isPanel || wheelEvent->isAccepted()))
             break;
     }
 }
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index c2bcc1585f..75a513fb67 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -1599,7 +1599,7 @@ int QHeaderView::minimumSectionSize() const
 void QHeaderView::setMinimumSectionSize(int size)
 {
     Q_D(QHeaderView);
-    if (size < 0 || size > maxSizeSection)
+    if (size < -1 || size > maxSizeSection)
         return;
     d->minimumSectionSize = size;
     if (d->minimumSectionSize > maximumSectionSize())
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 4e3ecf144a..9056ffe461 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -3761,6 +3761,16 @@ void QApplicationPrivate::giveFocusAccordingToFocusPolicy(QWidget *widget, QEven
         }
         if (focusWidget->isWindow())
             break;
+
+        // find out whether this widget (or its proxy) already has focus
+        QWidget *f = focusWidget;
+        if (focusWidget->d_func()->extra && focusWidget->d_func()->extra->focus_proxy)
+            f = focusWidget->d_func()->extra->focus_proxy;
+        // if it has, stop here.
+        // otherwise a click on the focused widget would remove its focus if ClickFocus isn't set
+        if (f->hasFocus())
+            break;
+
         localPos += focusWidget->pos();
         focusWidget = focusWidget->parentWidget();
     }
diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp
index e1376c754f..c1d3e95e7a 100644
--- a/src/widgets/kernel/qformlayout.cpp
+++ b/src/widgets/kernel/qformlayout.cpp
@@ -641,7 +641,7 @@ static inline int spacingHelper(QWidget* parent, QStyle *style, int userVSpacing
                 spacing = qMax(spacing, prevItem2->geometry().top() - wid->geometry().top() );
         }
     }
-    return spacing;
+    return qMax(spacing, 0);
 }
 
 static inline void initLayoutStruct(QLayoutStruct& sl, QFormLayoutItem* item)
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
index 22e15e23fe..edcbb08d1c 100644
--- a/src/widgets/kernel/qwidgetwindow.cpp
+++ b/src/widgets/kernel/qwidgetwindow.cpp
@@ -251,7 +251,9 @@ bool QWidgetWindow::event(QEvent *event)
     case QEvent::Show:
     case QEvent::Hide:
         return QWindow::event(event);
-
+    case QEvent::WindowBlocked:
+        qt_button_down = 0;
+        break;
     default:
         break;
     }
diff --git a/src/widgets/kernel/qwindowcontainer.cpp b/src/widgets/kernel/qwindowcontainer.cpp
index 7c319c5095..399f089e0f 100644
--- a/src/widgets/kernel/qwindowcontainer.cpp
+++ b/src/widgets/kernel/qwindowcontainer.cpp
@@ -222,6 +222,11 @@ void QWindowContainer::focusWindowChanged(QWindow *focusWindow)
 {
     Q_D(QWindowContainer);
     d->oldFocusWindow = focusWindow;
+    if (focusWindow == d->window) {
+        QWidget *widget = QApplication::focusWidget();
+        if (widget)
+            widget->clearFocus();
+    }
 }
 
 /*!
diff --git a/src/widgets/widgets/qkeysequenceedit.cpp b/src/widgets/widgets/qkeysequenceedit.cpp
index db39ceb08a..c056967cf7 100644
--- a/src/widgets/widgets/qkeysequenceedit.cpp
+++ b/src/widgets/widgets/qkeysequenceedit.cpp
@@ -50,6 +50,8 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_KEYSEQUENCEEDIT
 
+Q_STATIC_ASSERT(QKeySequencePrivate::MaxKeyCount == 4); // assumed by the code around here
+
 void QKeySequenceEditPrivate::init()
 {
     Q_Q(QKeySequenceEdit);
@@ -222,15 +224,7 @@ void QKeySequenceEdit::setKeySequence(const QKeySequence &keySequence)
 */
 void QKeySequenceEdit::clear()
 {
-    Q_D(QKeySequenceEdit);
-
-    d->resetState();
-
-    d->lineEdit->clear();
-    d->keySequence = QKeySequence();
-    d->keyNum = d->key[0] = d->key[1] = d->key[2] = d->key[3] = 0;
-    d->prevKey = -1;
-    emit keySequenceChanged(d->keySequence);
+    setKeySequence(QKeySequence());
 }
 
 /*!
@@ -280,7 +274,7 @@ void QKeySequenceEdit::keyPressEvent(QKeyEvent *e)
             return;
     }
 
-    if (d->keyNum >= QKeySequenceEditPrivate::MaxKeyCount)
+    if (d->keyNum >= QKeySequencePrivate::MaxKeyCount)
         return;
 
     nextKey |= d->translateModifiers(e->modifiers(), e->text());
@@ -291,7 +285,7 @@ void QKeySequenceEdit::keyPressEvent(QKeyEvent *e)
     QKeySequence key(d->key[0], d->key[1], d->key[2], d->key[3]);
     d->keySequence = key;
     QString text = key.toString(QKeySequence::NativeText);
-    if (d->keyNum < QKeySequenceEditPrivate::MaxKeyCount) {
+    if (d->keyNum < QKeySequencePrivate::MaxKeyCount) {
         //: This text is an "unfinished" shortcut, expands like "Ctrl+A, ..."
         text = tr("%1, ...").arg(text);
     }
@@ -307,7 +301,7 @@ void QKeySequenceEdit::keyReleaseEvent(QKeyEvent *e)
     Q_D(QKeySequenceEdit);
 
     if (d->prevKey == e->key()) {
-        if (d->keyNum < QKeySequenceEditPrivate::MaxKeyCount)
+        if (d->keyNum < QKeySequencePrivate::MaxKeyCount)
             d->releaseTimer = startTimer(1000);
         else
             d->finishEditing();
diff --git a/src/widgets/widgets/qkeysequenceedit_p.h b/src/widgets/widgets/qkeysequenceedit_p.h
index 58c9699059..f74433bb71 100644
--- a/src/widgets/widgets/qkeysequenceedit_p.h
+++ b/src/widgets/widgets/qkeysequenceedit_p.h
@@ -46,6 +46,7 @@
 #include "qkeysequenceedit.h"
 
 #include <private/qwidget_p.h>
+#include <private/qkeysequence_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -57,8 +58,6 @@ class QKeySequenceEditPrivate : public QWidgetPrivate
 {
     Q_DECLARE_PUBLIC(QKeySequenceEdit)
 public:
-    enum { MaxKeyCount = 4 };
-
     void init();
     int translateModifiers(Qt::KeyboardModifiers state, const QString &text);
     void resetState();
@@ -67,7 +66,7 @@ public:
     QLineEdit *lineEdit;
     QKeySequence keySequence;
     int keyNum;
-    int key[MaxKeyCount];
+    int key[QKeySequencePrivate::MaxKeyCount];
     int prevKey;
     int releaseTimer;
 };