diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 10:20:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 10:20:10 (GMT) |
| commit | 64ca7030df6189a0bc4df36473befd868c8d2ef6 (patch) | |
| tree | d5164b278656949ceb079a299d8608b01a4a66fa /src/gui/kernel | |
| parent | f3da2f414f9fce9aa014da79be9f50c075c60936 (diff) | |
| parent | 615aa8b5f3187811c0b9347aebbec491f3fcf7ca (diff) | |
| download | Qt-64ca7030df6189a0bc4df36473befd868c8d2ef6.zip Qt-64ca7030df6189a0bc4df36473befd868c8d2ef6.tar.gz Qt-64ca7030df6189a0bc4df36473befd868c8d2ef6.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QPrintDialog::setPrinter(), QPrintDialog::printer(), QPrintDialog::addButton should be documented as QT3 support member
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ca7b2e1e1ca558050cf49dd8f7c9b35e4b9d4df5 )
Fix autotest memory leak
Carbon: crash problem in QWidgetPrivate::hide_sys, v2
Carbon: crash problem in QWidgetPrivate::hide_sys
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index f61d2fe..d255604 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -644,6 +644,8 @@ extern "C" { - (void)mouseEntered:(NSEvent *)event { + if (qwidgetprivate->data.in_destructor) + return; QEvent enterEvent(QEvent::Enter); NSPoint windowPoint = [event locationInWindow]; NSPoint globalPoint = [[event window] convertBaseToScreen:windowPoint]; diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index ebfab21..78c1562 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -3510,6 +3510,8 @@ void QWidgetPrivate::hide_sys() if (!QWidget::mouseGrabber()){ QWidget *enterWidget = QApplication::widgetAt(QCursor::pos()); + if (enterWidget && enterWidget->data->in_destructor) + enterWidget = 0; QApplicationPrivate::dispatchEnterLeave(enterWidget, qt_mouseover); qt_mouseover = enterWidget; } |