diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-16 09:02:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-16 09:02:08 (GMT) |
| commit | be28d74406ba093649fde89e9bad52129920c389 (patch) | |
| tree | 5b5151cde25e6efc689084f96703b935811e34e8 | |
| parent | 50a69bd2c7621148b1e21e494b14ddc81b61f566 (diff) | |
| parent | fcdd6eba85ecfe65856bc20910810659a4b5df00 (diff) | |
| download | Qt-be28d74406ba093649fde89e9bad52129920c389.zip Qt-be28d74406ba093649fde89e9bad52129920c389.tar.gz Qt-be28d74406ba093649fde89e9bad52129920c389.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team:
Remove warning about null cursor handle on S60 while handle is valid
| -rw-r--r-- | src/gui/kernel/qcursor_s60.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qcursor_s60.cpp b/src/gui/kernel/qcursor_s60.cpp index 68e079e..6369f25 100644 --- a/src/gui/kernel/qcursor_s60.cpp +++ b/src/gui/kernel/qcursor_s60.cpp @@ -472,9 +472,9 @@ void qt_symbian_setWindowGroupCursor(const QCursor &cursor, RWindowTreeNode &nod if (handle) { RWsPointerCursor *pcurs = reinterpret_cast<RWsPointerCursor *> (handle); node.SetCustomPointerCursor(*pcurs); - } + } else #ifdef Q_SYMBIAN_HAS_SYSTEM_CURSORS - else { + { TInt shape = qt_symbian_translate_cursor_shape(cursor.shape()); node.SetPointerCursor(shape); } |