2 files changed, 12 insertions, 0 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 997a663c27..6634a2eb69 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -4503,6 +4503,15 @@ void QApplicationPrivate::notifyThemeChanged()
     initSystemPalette();
 }
 
+#ifndef QT_NO_DRAGANDDROP
+void QApplicationPrivate::notifyDragStarted(const QDrag *drag)
+{
+    // Prevent pickMouseReceiver() from using the widget where the drag was started after a drag operation.
+    QGuiApplicationPrivate::notifyDragStarted(drag);
+    qt_button_down = 0;
+}
+#endif // QT_NO_DRAGANDDROP
+
 #ifndef QT_NO_GESTURES
 QGestureManager* QGestureManager::instance()
 {
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h
index 7b69129d29..3ce590865b 100644
--- a/src/widgets/kernel/qapplication_p.h
+++ b/src/widgets/kernel/qapplication_p.h
@@ -195,6 +195,9 @@ public:
 
 protected:
     void notifyThemeChanged();
+#ifndef QT_NO_DRAGANDDROP
+    void notifyDragStarted(const QDrag *);
+#endif // QT_NO_DRAGANDDROP
 
 public:
     static QFont *sys_font;