summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-09-22 13:38:42 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-09-22 13:38:42 (GMT)
commit743bbbcc808fe8333018bf6c95f1d6db5494642f (patch)
tree17d2696482624d3181696c7c9d14ce4c74a2d491
parentcf5c144770c08691260b14212afe646b1b23afe2 (diff)
parent6f6493747121db428a71d494c8cb3f04a0292279 (diff)
downloadQt-743bbbcc808fe8333018bf6c95f1d6db5494642f.zip
Qt-743bbbcc808fe8333018bf6c95f1d6db5494642f.tar.gz
Qt-743bbbcc808fe8333018bf6c95f1d6db5494642f.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Incorrect 'break' in switch-case was replaced by 'return'
-rw-r--r--src/gui/kernel/qcursor_win.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qcursor_win.cpp b/src/gui/kernel/qcursor_win.cpp
index cef83f5..a68472c 100644
--- a/src/gui/kernel/qcursor_win.cpp
+++ b/src/gui/kernel/qcursor_win.cpp
@@ -477,7 +477,7 @@ void QCursorData::update()
QPixmap pixmap = QApplicationPrivate::instance()->getPixmapCursor(cshape);
hcurs = create32BitCursor(pixmap, hx, hy);
}
- break;
+ return;
default:
qWarning("QCursor::update: Invalid cursor shape %d", cshape);
return;