diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-10-14 16:17:58 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-10-14 16:17:58 (GMT) |
| commit | d089496936b9a17d7849d49b74f85838cb711634 (patch) | |
| tree | 8395c56f3c1e6b64cb781d7311fda56081f0ef51 /src/gui/kernel | |
| parent | 2543ed5b1b18864797b3a11c9bd13887c7567e86 (diff) | |
| parent | 7a6a50879322945110120ffdec5d0e6820fc4b54 (diff) | |
| download | Qt-d089496936b9a17d7849d49b74f85838cb711634.zip Qt-d089496936b9a17d7849d49b74f85838cb711634.tar.gz Qt-d089496936b9a17d7849d49b74f85838cb711634.tar.bz2 | |
Merge remote branch 'qt/4.7' into 4.7
Conflicts:
src/corelib/kernel/qtranslator.cpp
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qcursor_win.cpp | 2 |
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; |