1 files changed, 20 insertions, 18 deletions
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp
index 6b273dcd43..973f6efdcc 100644
--- a/src/quick/items/qquickmultipointtoucharea.cpp
+++ b/src/quick/items/qquickmultipointtoucharea.cpp
@@ -324,7 +324,6 @@ void QQuickTouchPoint::setSceneY(qreal sceneY)
 
 QQuickMultiPointTouchArea::QQuickMultiPointTouchArea(QQuickItem *parent)
     : QQuickItem(parent),
-      _currentWindow(0),
       _minimumTouchPoints(0),
       _maximumTouchPoints(INT_MAX),
       _stealMouse(false)
@@ -334,8 +333,8 @@ QQuickMultiPointTouchArea::QQuickMultiPointTouchArea(QQuickItem *parent)
     if (qmlVisualTouchDebugging()) {
         setFlag(QQuickItem::ItemHasContents);
     }
-#ifdef Q_OS_MAC
-    connect(this, &QQuickItem::windowChanged, this, &QQuickMultiPointTouchArea::setTouchEventsEnabledForWindow);
+#ifdef Q_OS_OSX
+    setAcceptHoverEvents(true); // needed to enable touch events on mouse hover.
 #endif
 }
 
@@ -548,28 +547,31 @@ void QQuickMultiPointTouchArea::addTouchPoint(const QTouchEvent::TouchPoint *p)
     _pressedTouchPoints.append(dtp);
 }
 
-void QQuickMultiPointTouchArea::setTouchEventsEnabledForWindow(QWindow *window)
+#ifdef Q_OS_OSX
+void QQuickMultiPointTouchArea::hoverEnterEvent(QHoverEvent *event)
+{
+    Q_UNUSED(event);
+    setTouchEventsEnabled(true);
+}
+
+void QQuickMultiPointTouchArea::hoverLeaveEvent(QHoverEvent *event)
+{
+    Q_UNUSED(event);
+    setTouchEventsEnabled(false);
+}
+
+void QQuickMultiPointTouchArea::setTouchEventsEnabled(bool enable)
 {
-#ifdef Q_OS_MAC
     // Resolve function for enabling touch events from the (cocoa) platform plugin.
     typedef void (*RegisterTouchWindowFunction)(QWindow *, bool);
     RegisterTouchWindowFunction registerTouchWindow = reinterpret_cast<RegisterTouchWindowFunction>(
         QGuiApplication::platformNativeInterface()->nativeResourceFunctionForIntegration("registertouchwindow"));
     if (!registerTouchWindow)
-        return; // Not necessarily an error, Qt migh be using a different platform plugin.
-
-    // Disable touch on the old window, enable on the new window.
-    if (_currentWindow)
-        registerTouchWindow(_currentWindow, false);
-    if (window)
-        registerTouchWindow(window, true);
-    // Save the current window, setTouchEventsEnabledForWindow will be called
-    // with a null window on disable.
-    _currentWindow = window;
-#else // Q_OS_MAC
-    Q_UNUSED(window)
-#endif
+        return; // Not necessarily an error, Qt might be using a different platform plugin.
+
+    registerTouchWindow(window(), enable);
 }
+#endif // Q_OS_OSX
 
 void QQuickMultiPointTouchArea::addTouchPrototype(QQuickTouchPoint *prototype)
 {