diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-06-08 12:18:02 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-06-08 12:18:02 (GMT) |
| commit | 2a793356005bda3d99ce58bf0197d9b3b8fd8578 (patch) | |
| tree | f20f9df1930e6ecad8432905a915903394563125 /src | |
| parent | 21fef75cd50b00609a803f123cc27ad0ee9ba509 (diff) | |
| parent | e0405b6b42ddf794935af27a0265ca259c73ce4c (diff) | |
| download | Qt-2a793356005bda3d99ce58bf0197d9b3b8fd8578.zip Qt-2a793356005bda3d99ce58bf0197d9b3b8fd8578.tar.gz Qt-2a793356005bda3d99ce58bf0197d9b3b8fd8578.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qwidget_win.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp index 0f341fd..ea79329 100644 --- a/src/gui/kernel/qwidget_win.cpp +++ b/src/gui/kernel/qwidget_win.cpp @@ -1845,7 +1845,8 @@ void QWidgetPrivate::setMask_sys(const QRegion ®ion) OffsetRgn(wr, offset.x(), offset.y()); Q_ASSERT(q->testAttribute(Qt::WA_WState_Created)); - SetWindowRgn(data.winid, wr, true); + if (!SetWindowRgn(data.winid, wr, true)) + DeleteObject(wr); } void QWidgetPrivate::updateFrameStrut() |