diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-09-26 22:59:22 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 03:17:10 +0200 |
| commit | 926d6189bf4f954b80b2a019d8bde5f85d4d2b4c (patch) | |
| tree | 0fe84591263e4e964a80be68a414e8875fbce418 /src/gui/kernel | |
| parent | 009480275e0bfc471a7c315ac5f74e941c1e85ff (diff) | |
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>
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qdnd.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp index b3aa206234..de255b9cc5 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)); - } } |