diff options
| author | Paul Olav Tvete <paul.tvete@gmail.com> | 2014-06-10 11:09:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-10 22:23:07 +0200 |
| commit | 906cf6ce32604dc71d3e5b33f2de2f0046e252ff (patch) | |
| tree | 20d32303488bb4b957d3e8b1bc9815332409fd68 /src/quickwidgets/qquickwidget.cpp | |
| parent | 0a575482d5583076ba0ce812cab6c32732b1c280 (diff) | |
Drag&Drop support for child items in QQuickWidget
This is a quick-fix. The real issue is that QWidget and QWindow
reacts differently when a QDragEnterEvent is rejected.
Change-Id: I3e3e50610c14acfaada9c1b243b88cfe9eae54b2
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/quickwidgets/qquickwidget.cpp')
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 439b039266..3743a8cf1e 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -1006,13 +1006,18 @@ bool QQuickWidget::event(QEvent *e) switch (e->type()) { #ifndef QT_NO_DRAGANDDROP case QEvent::Drop: - case QEvent::DragEnter: case QEvent::DragMove: case QEvent::DragLeave: // Drag/drop events only have local pos, so no need to map, // but QQuickWindow::event() does not return true d->offscreenWindow->event(e); return e->isAccepted(); + case QEvent::DragEnter: + // Don't reject drag events for the entire widget when one + // item rejects the drag enter + d->offscreenWindow->event(e); + e->accept(); + return true; #endif case QEvent::TouchBegin: case QEvent::TouchEnd: |