summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-12 17:38:17 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-12 17:38:17 (GMT)
commita3422d2125cafc061c396d886266774a29f993ae (patch)
tree1e0575bc8120f9484cc10f24778f4feab6b260ba /src/gui
parent7086488612e3a1d877c237d10d89640d5384b1d9 (diff)
parent762a9ba066db3b31a4b3c0c2fc01d545b93348fc (diff)
downloadQt-a3422d2125cafc061c396d886266774a29f993ae.zip
Qt-a3422d2125cafc061c396d886266774a29f993ae.tar.gz
Qt-a3422d2125cafc061c396d886266774a29f993ae.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: Missed break of switch-case added
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qcursor_win.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qcursor_win.cpp b/src/gui/kernel/qcursor_win.cpp
index 9f0c516..cef83f5 100644
--- a/src/gui/kernel/qcursor_win.cpp
+++ b/src/gui/kernel/qcursor_win.cpp
@@ -477,6 +477,7 @@ void QCursorData::update()
QPixmap pixmap = QApplicationPrivate::instance()->getPixmapCursor(cshape);
hcurs = create32BitCursor(pixmap, hx, hy);
}
+ break;
default:
qWarning("QCursor::update: Invalid cursor shape %d", cshape);
return;