From 0f13f8d2ed2a207c5f8aaefc9118d6ed0e692e0e Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Fri, 22 Jan 2016 10:37:50 +0100
Subject: Don't leak wheel events through modal popups

Change-Id: Ib7768d2efd25583fff66c0e4169a3454aaa6cf9d
Task-number: QTBUG-50577
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
---
 src/templates/qquickoverlay.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/templates/qquickoverlay.cpp')

diff --git a/src/templates/qquickoverlay.cpp b/src/templates/qquickoverlay.cpp
index e06d28ea..ecee2767 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);
-- 
cgit v1.2.3