diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-06-15 11:34:34 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-06-22 14:32:44 +0000 |
| commit | 993889401b889b544171f4fa968d8aabb71241b7 (patch) | |
| tree | 596cf381497ec6c51ed74bcfb4521d90c0b19218 | |
| parent | 4fe865ac7a701b7c950ee0c79b6153b43e1b49ae (diff) | |
| download | qtbase-993889401b889b544171f4fa968d8aabb71241b7.tar.gz | |
Revert "Windows: Use DND effect chosen in DragEnter/Move for Drop."
The change causes items in QListWidget and QTreeWidget to disappear during
InternalMove since the widgets modify the actions of the event
to remember an internal state.
This reverts commit 988f1b2e5745646cf1bd7f9f65507356ff2ba12e.
Task-number: QTBUG-46642
Task-number: QTBUG-43466
Change-Id: I27d888d7a1fdfcf8eaf8806ccd4ca33b292b9d8c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsdrag.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdrag.cpp b/src/plugins/platforms/windows/qwindowsdrag.cpp index e10add9c7c..03438e3ee2 100644 --- a/src/plugins/platforms/windows/qwindowsdrag.cpp +++ b/src/plugins/platforms/windows/qwindowsdrag.cpp @@ -626,7 +626,7 @@ QWindowsOleDropTarget::Drop(LPDATAOBJECT pDataObj, DWORD grfKeyState, const QPlatformDropQtResponse response = QWindowSystemInterface::handleDrop(m_window, windowsDrag->dropData(), m_lastPoint / QWindowsScaling::factor(), - translateToQDragDropActions(m_chosenEffect)); + translateToQDragDropActions(*pdwEffect)); if (response.isAccepted()) { const Qt::DropAction action = response.acceptedAction(); |