diff options
author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-01-19 12:19:20 (GMT) |
---|---|---|
committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-01-19 12:19:20 (GMT) |
commit | 79597969ee167b71bfbc28c2c56df8c2c8960e19 (patch) | |
tree | 62d2d151029625dc37ccc1f940eef54c776b1f47 /src/gui/kernel | |
parent | de1b44c967501666bfcb7a28d4c233708ce2c65e (diff) | |
download | Qt-79597969ee167b71bfbc28c2c56df8c2c8960e19.zip Qt-79597969ee167b71bfbc28c2c56df8c2c8960e19.tar.gz Qt-79597969ee167b71bfbc28c2c56df8c2c8960e19.tar.bz2 |
Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask)
Now that we alien is in use, several of the auto tests are
that needed special handling for mac before, are now expected
to pass. Which they also do. This patch turns them on :)
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 0161b33..df8e61e 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -5007,19 +5007,24 @@ void QWidgetPrivate::registerTouchWindow() void QWidgetPrivate::setMask_sys(const QRegion ®ion) { Q_UNUSED(region); -#ifndef QT_MAC_USE_COCOA Q_Q(QWidget); + +#ifndef QT_MAC_USE_COCOA if (q->isWindow()) ReshapeCustomWindow(qt_mac_window_for(q)); else HIViewReshapeStructure(qt_mac_nativeview_for(q)); #else + if (!q->internalWinId()) + return; + if (extra->mask.isEmpty()) { extra->maskBits = QImage(); finishCocoaMaskSetup(); } else { syncCocoaMask(); } + topLevelAt_cache = 0; #endif } |