summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@nokia.com>2010-09-06 13:38:07 (GMT)
committerTor Arne Vestbø <tor.arne.vestbo@nokia.com>2010-09-06 13:41:29 (GMT)
commitda7e5f0852b86392d2de413afa2d799ba46424b2 (patch)
tree751566a65cda5353c59c78f9cdd4972f467730ea
parentdb6c4246f5bce98d0ec8f16186618d99b7db5dcc (diff)
downloadQt-da7e5f0852b86392d2de413afa2d799ba46424b2.zip
Qt-da7e5f0852b86392d2de413afa2d799ba46424b2.tar.gz
Qt-da7e5f0852b86392d2de413afa2d799ba46424b2.tar.bz2
Fix failing tst_qmdisubwindow test after 71a3b1a0d3
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
-rw-r--r--src/gui/kernel/qcocoasharedwindowmethods_mac_p.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
index 16f5bd6..ddf1a27 100644
--- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
+++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
@@ -234,8 +234,10 @@ QT_END_NAMESPACE
// This method is called the first time the window is placed on screen and
// is the earliest point in time we can connect OpenGL contexts to NSViews.
QWidget *qwidget = [[QT_MANGLE_NAMESPACE(QCocoaWindowDelegate) sharedDelegate] qt_qwidgetForWindow:self];
- qt_event_request_window_change(qwidget);
- qt_mac_send_posted_gl_updates(qwidget);
+ if (qwidget) {
+ qt_event_request_window_change(qwidget);
+ qt_mac_send_posted_gl_updates(qwidget);
+ }
[super setInitialFirstResponder:view];
}