diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-28 07:46:47 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-06-28 07:46:47 +0000 |
| commit | cb6cba2b6f11ba67a93135ac1646971e71da345b (patch) | |
| tree | 441b4a02f9d03b851aa08c419c76de7c5da0b6f6 /src/plugins/platforms/windows | |
| parent | f1b01b7d159bcf04a2b832dba36f876479669641 (diff) | |
| parent | 4dd8a63fc13cee365c58ef67fa4a4503aeceebe8 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5.0' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src/plugins/platforms/windows')
| -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(); |