diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-06-07 15:07:44 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-06-07 15:50:54 +0200 |
| commit | 4386425ce310815076739ea5f15fe4f1218599c8 (patch) | |
| tree | 55a186c2201c195dceb5f902333bd208f5e01d0b /src/gui | |
| parent | 71304aefd0668f6ba2d41ef84d7f48aaa95db06f (diff) | |
Implement QDropEvent::source() again
QDropEvent::source() now returns a QObject
instead of a widget, matching the implementation
in QDrag.
Reviewed-by: Samuel
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 10 | ||||
| -rw-r--r-- | src/gui/kernel/qevent.h | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 5e01e43e56..f5a5c2826a 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -46,7 +46,7 @@ #include "private/qkeysequence_p.h" #include "qdebug.h" #include "qmime.h" -//#include "private/qdnd_p.h" +#include "private/qdnd_p.h" #include "qevent_p.h" #ifdef Q_OS_SYMBIAN @@ -2265,12 +2265,10 @@ bool QDropEvent::provides(const char *mimeType) const \sa QDrag::QDrag() */ -QWidget* QDropEvent::source() const +QObject* QDropEvent::source() const { - return 0; - // ### Qt5 -// QDragManager *manager = QDragManager::self(); -// return manager ? manager->source() : 0; + QDragManager *manager = QDragManager::self(); + return (manager && manager->object) ? manager->object->source() : 0; } diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 21a0b05b55..fc9e8118fd 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -443,7 +443,7 @@ public: inline Qt::DropAction dropAction() const { return drop_action; } void setDropAction(Qt::DropAction action); - QWidget* source() const; + QObject* source() const; inline const QMimeData *mimeData() const { return mdata; } // QT3_SUPPORT |