diff options
| author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-01-07 10:16:57 (GMT) |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-01-07 10:16:57 (GMT) |
| commit | ba8c96ee48cbad70f83919c4dcfc133566442bea (patch) | |
| tree | 5089c5fe3abad2da60e3956c3cf1cb498ada43f2 /src/gui/kernel | |
| parent | 9cc21c043238dc7576a465c9d236e8968fd8c549 (diff) | |
| parent | 8c4a4293a0995b9b37bd59863c3e2fb902ec3dc7 (diff) | |
| download | Qt-ba8c96ee48cbad70f83919c4dcfc133566442bea.zip Qt-ba8c96ee48cbad70f83919c4dcfc133566442bea.tar.gz Qt-ba8c96ee48cbad70f83919c4dcfc133566442bea.tar.bz2 | |
Merge branch 'review-4.7' into staging-4.7
Diffstat (limited to 'src/gui/kernel')
| -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); } |