From: Lars Knoll <lars.knoll@nokia.com>
Date: Mon, 26 Sep 2011 20:59:22 +0000 (+0200)
Subject: Don't crash if qApp->overrideCursor() is 0
X-Git-Tag: qt-v5.0.0-alpha1~3435
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=926d6189bf4f954b80b2a019d8bde5f85d4d2b4c;p=profile%2Fivi%2Fqtbase.git

Don't crash if qApp->overrideCursor() is 0

Change-Id: I9e61be7ed537a988ce8ccca20f672f5c66275452
Reviewed-on: http://codereview.qt-project.org/5561
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---

diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp
index b3aa206..de255b9 100644
--- a/src/gui/kernel/qdnd.cpp
+++ b/src/gui/kernel/qdnd.cpp
@@ -365,10 +365,9 @@ void QDragManager::updateCursor()
             cursorShape = Qt::DragMoveCursor;
         }
     }
-    if (cursorShape != qApp->overrideCursor()->shape()) {
-        qDebug() << "setting cursor shape to" << cursorShape;
+    QCursor *cursor = qApp->overrideCursor();
+    if (cursor && cursorShape != cursor->shape())
         qApp->changeOverrideCursor(QCursor(cursorShape));
-    }
 }