1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdrag.cpp b/src/plugins/platforms/windows/qwindowsdrag.cpp
index 870e7fec07..fcd9911a56 100644
--- a/src/plugins/platforms/windows/qwindowsdrag.cpp
+++ b/src/plugins/platforms/windows/qwindowsdrag.cpp
@@ -239,8 +239,6 @@ private:
     };
 
     typedef QMap<Qt::DropAction, CursorEntry> ActionCursorMap;
-    typedef ActionCursorMap::Iterator ActionCursorMapIt;
-    typedef ActionCursorMap::ConstIterator ActionCursorMapConstIt;
 
     const Mode m_mode;
     QWindowsDrag *m_drag;
@@ -318,7 +316,7 @@ void QWindowsOleDropSource::createCursors()
         if (cursorPixmap.isNull())
             cursorPixmap = m_drag->defaultCursor(action);
         const qint64 cacheKey = cursorPixmap.cacheKey();
-        const ActionCursorMapIt it = m_cursors.find(action);
+        const auto it = m_cursors.find(action);
         if (it != m_cursors.end() && it.value().cacheKey == cacheKey)
             continue;
         if (cursorPixmap.isNull()) {
@@ -399,7 +397,7 @@ QWindowsOleDropSource::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState)
 {
     HRESULT hr = S_OK;
     do {
-        if (fEscapePressed) {
+        if (fEscapePressed || QWindowsDrag::isCanceled()) {
             hr = ResultFromScode(DRAGDROP_S_CANCEL);
             break;
         }
@@ -447,7 +445,7 @@ QWindowsOleDropSource::GiveFeedback(DWORD dwEffect)
     m_drag->updateAction(action);
 
     const qint64 currentCacheKey = m_drag->currentDrag()->dragCursor(action).cacheKey();
-    ActionCursorMapConstIt it = m_cursors.constFind(action);
+    auto it = m_cursors.constFind(action);
     // If a custom drag cursor is set, check its cache key to detect changes.
     if (it == m_cursors.constEnd() || (currentCacheKey && currentCacheKey != it.value().cacheKey)) {
         createCursors();
@@ -679,6 +677,8 @@ QWindowsOleDropTarget::Drop(LPDATAOBJECT pDataObj, DWORD grfKeyState,
     \ingroup qt-lighthouse-win
 */
 
+bool QWindowsDrag::m_canceled = false;
+
 QWindowsDrag::QWindowsDrag() :
     m_dropDataObject(0), m_cachedDropTargetHelper(0)
 {
@@ -808,6 +808,7 @@ Qt::DropAction QWindowsDrag::drag(QDrag *drag)
     Qt::DropAction dragResult = Qt::IgnoreAction;
 
     DWORD resultEffect;
+    QWindowsDrag::m_canceled = false;
     QWindowsOleDropSource *windowDropSource = new QWindowsOleDropSource(this);
     windowDropSource->createCursors();
     QWindowsOleDataObject *dropDataObject = new QWindowsOleDataObject(dropData);