diff options
| -rw-r--r-- | src/gui/kernel/qdnd_win.cpp | 3 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_win.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/kernel/qdnd_win.cpp b/src/gui/kernel/qdnd_win.cpp index 96261ea..596d57a 100644 --- a/src/gui/kernel/qdnd_win.cpp +++ b/src/gui/kernel/qdnd_win.cpp @@ -703,7 +703,8 @@ QOleDropTarget::DragOver(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) if (!QApplicationPrivate::tryModalHelper(dragOverWidget) - || !dragOverWidget->testAttribute(Qt::WA_DropSiteRegistered)) { + || !dragOverWidget->testAttribute(Qt::WA_DropSiteRegistered) + || !dragOverWidget->acceptDrops()) { *pdwEffect = DROPEFFECT_NONE; return NOERROR; } diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp index 8a400cd..d09fafe 100644 --- a/src/gui/kernel/qwidget_win.cpp +++ b/src/gui/kernel/qwidget_win.cpp @@ -1773,8 +1773,6 @@ QOleDropTarget* QWidgetPrivate::registerOleDnd(QWidget *widget) Q_ASSERT(nativeParent); QWExtra *nativeExtra = nativeParent->d_func()->extra; Q_ASSERT(nativeExtra); - if (!nativeParent->acceptDrops()) - nativeParent->setAcceptDrops(true); if (!nativeExtra->oleDropWidgets.contains(widget)) nativeExtra->oleDropWidgets.append(widget); if (!nativeExtra->dropTarget) { |