From 1bae226076b37ba925bf810639e1674130ad622a Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 18 Aug 2014 14:13:44 +0200 Subject: Make QWindowContainer handle drag'n'drop Drag'n'drop events were not propagated by a the QWindowContainer to the embedded QWindow. This patch makes the widget accept the events and pass them on Task-number: QTBUG-40603 Change-Id: I97320fbcad27f7c6aa48c95c90bb42dda634764e Reviewed-by: Gunnar Sletta --- src/widgets/kernel/qwindowcontainer.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/widgets/kernel/qwindowcontainer.cpp') diff --git a/src/widgets/kernel/qwindowcontainer.cpp b/src/widgets/kernel/qwindowcontainer.cpp index dc35dee1a9..206a265761 100644 --- a/src/widgets/kernel/qwindowcontainer.cpp +++ b/src/widgets/kernel/qwindowcontainer.cpp @@ -206,6 +206,7 @@ QWindowContainer::QWindowContainer(QWindow *embeddedWindow, QWidget *parent, Qt: d->window = embeddedWindow; d->window->setParent(&d->fakeParent); + setAcceptDrops(true); connect(QGuiApplication::instance(), SIGNAL(focusWindowChanged(QWindow*)), this, SLOT(focusWindowChanged(QWindow*))); } @@ -298,6 +299,13 @@ bool QWindowContainer::event(QEvent *e) } } break; +#ifndef QT_NO_DRAGANDDROP + case QEvent::Drop: + case QEvent::DragEnter: + case QEvent::DragMove: + case QEvent::DragLeave: + return d->window->event(e); +#endif default: break; } -- cgit v1.2.3