Merge remote-tracking branch 'origin/5.6' into dev

Conflicts:
	.gitignore
	src/templates/qquickcombobox_p.h
	src/templates/qquickmenu_p.h
	src/templates/qquickmenu_p_p.h
	src/templates/qquickoverlay_p.h
	src/templates/qquickpopup.cpp
	src/templates/qquickpopup_p.h
	src/templates/qquickstackview_p.cpp

Change-Id: I89c7d518697beec0b81ef3a12205286a4f3ccf89

1 files changed, 9 insertions, 3 deletions

diff --git a/src/templates/qquickoverlay.cpp b/src/templates/qquickoverlay.cpp
index 5455676f..8b19e8e9 100644
--- a/src/templates/qquickoverlay.cpp
+++ b/src/templates/qquickoverlay.cpp
@@ -240,6 +240,12 @@ void QQuickOverlay::mouseReleaseEvent(QMouseEvent *event)
     emit released();
 }
 
+void QQuickOverlay::wheelEvent(QWheelEvent *event)
+{
+    Q_D(QQuickOverlay);
+    event->setAccepted(d->modalPopups > 0);
+}
+
 bool QQuickOverlay::childMouseEventFilter(QQuickItem *item, QEvent *event)
 {
     Q_D(QQuickOverlay);
@@ -255,11 +261,11 @@ bool QQuickOverlay::childMouseEventFilter(QQuickItem *item, QEvent *event)
     const QQuickItemPrivate *priv = QQuickItemPrivate::get(this);
     const QList<QQuickItem *> &sortedChildren = priv->paintOrderChildItems();
     for (int i = sortedChildren.count() - 1; i >= 0; --i) {
-        QQuickItem *contentItem = sortedChildren[i];
-        if (contentItem == item)
+        QQuickItem *popupItem = sortedChildren[i];
+        if (popupItem == item)
             break;
 
-        QQuickPopup *popup = d->popups.value(contentItem);
+        QQuickPopup *popup = d->popups.value(popupItem);
         if (popup) {
             emit popup->pressedOutside();