summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qevent.cpp10
-rw-r--r--src/gui/kernel/qevent.h2
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