1 files changed, 23 insertions, 14 deletions

diff --git a/src/gui/kernel/qsimpledrag.cpp b/src/gui/kernel/qsimpledrag.cpp
index a2412008f8..b850f53014 100644
--- a/src/gui/kernel/qsimpledrag.cpp
+++ b/src/gui/kernel/qsimpledrag.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -201,7 +201,16 @@ void QBasicDrag::startDrag()
 
     m_drag_icon_window->setPixmap(m_drag->pixmap());
     m_drag_icon_window->setHotspot(m_drag->hotSpot());
-    m_drag_icon_window->updateGeometry();
+
+#ifndef QT_NO_CURSOR
+    QPoint pos = QCursor::pos();
+    if (pos.x() == int(qInf())) {
+        // ### fixme: no mouse pos registered. Get pos from touch...
+        pos = QPoint();
+    }
+    m_drag_icon_window->updateGeometry(pos);
+#endif
+
     m_drag_icon_window->setVisible(true);
 
     enableEventFilter();
@@ -218,10 +227,10 @@ void QBasicDrag::cancel()
     m_drag_icon_window->setVisible(false);
 }
 
-void QBasicDrag::move(const QMouseEvent *)
+void QBasicDrag::move(const QMouseEvent *e)
 {
     if (m_drag)
-        m_drag_icon_window->updateGeometry();
+        m_drag_icon_window->updateGeometry(e->globalPos());
 }
 
 void QBasicDrag::drop(const QMouseEvent *)
@@ -255,18 +264,18 @@ void QBasicDrag::updateCursor(Qt::DropAction action)
         }
     }
 
-    QCursor *cursor = qApp->overrideCursor();
+    QCursor *cursor = QGuiApplication::overrideCursor();
     QPixmap pixmap = m_drag->dragCursor(action);
     if (!cursor) {
-        qApp->changeOverrideCursor((pixmap.isNull()) ? QCursor(cursorShape) : QCursor(pixmap));
+        QGuiApplication::changeOverrideCursor((pixmap.isNull()) ? QCursor(cursorShape) : QCursor(pixmap));
     } else {
         if (!pixmap.isNull()) {
             if ((cursor->pixmap().cacheKey() != pixmap.cacheKey())) {
-                qApp->changeOverrideCursor(QCursor(pixmap));
+                QGuiApplication::changeOverrideCursor(QCursor(pixmap));
             }
         } else {
             if (cursorShape != cursor->shape()) {
-                qApp->changeOverrideCursor(QCursor(cursorShape));
+                QGuiApplication::changeOverrideCursor(QCursor(cursorShape));
             }
         }
     }