From cf2b5a7722e2d919f57f7094124dbcf52ae79b68 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 9 Jul 2012 12:50:00 +0200 Subject: Clear qt_button_down widget when starting a drag. Prevent pickMouseReceiver() from using the widget from which the drag was started. Task-number: QTBUG-26145 Change-Id: I65d4c295a894193e41c676fb9fd1f7113c2631b5 Reviewed-by: Girish Ramakrishnan --- src/gui/kernel/qdnd.cpp | 1 + src/gui/kernel/qguiapplication.cpp | 8 ++++++++ src/gui/kernel/qguiapplication_p.h | 8 ++++++++ 3 files changed, 17 insertions(+) (limited to 'src/gui/kernel') diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp index 8182719830..a97583b4ef 100644 --- a/src/gui/kernel/qdnd.cpp +++ b/src/gui/kernel/qdnd.cpp @@ -195,6 +195,7 @@ Qt::DropAction QDragManager::drag(QDrag *o) m_object->d_func()->target = 0; + QGuiApplicationPrivate::instance()->notifyDragStarted(o); const Qt::DropAction result = m_platformDrag->drag(m_object); m_object = 0; return result; diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index fd7e32e96f..a9986422c8 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -2527,6 +2527,14 @@ void QGuiApplicationPrivate::notifyThemeChanged() } } +#ifndef QT_NO_DRAGANDDROP +void QGuiApplicationPrivate::notifyDragStarted(const QDrag *drag) +{ + Q_UNUSED(drag) + +} +#endif + const QDrawHelperGammaTables *QGuiApplicationPrivate::gammaTables() { QDrawHelperGammaTables *result = m_gammaTables.load(); diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 857dc5390e..58a82a9cc5 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -62,6 +62,9 @@ class QPlatformIntegration; class QPlatformTheme; class QPlatformDragQtResponse; struct QDrawHelperGammaTables; +#ifndef QT_NO_DRAGANDDROP +class QDrag; +#endif // QT_NO_DRAGANDDROP class Q_GUI_EXPORT QGuiApplicationPrivate : public QCoreApplicationPrivate { @@ -240,8 +243,13 @@ public: protected: virtual void notifyThemeChanged(); +#ifndef QT_NO_DRAGANDDROP + virtual void notifyDragStarted(const QDrag *); +#endif // QT_NO_DRAGANDDROP private: + friend class QDragManager; + void init(); static QGuiApplicationPrivate *self; -- cgit v1.2.3