diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 17:12:22 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 17:12:22 +1000 |
| commit | 1a74e8246a560695b80d1c337b1e2c1bcd13b25e (patch) | |
| tree | 630deaf2e4235cc8d1a38476e30c46bf7b02bdc9 | |
| parent | 02e5e46e460f0bba1d586906e3135952e758b0a6 (diff) | |
| parent | 1be4b50bacda6301f64f62e796562a91f03bc199 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Compile.
| -rw-r--r-- | src/gui/kernel/qcocoasharedwindowmethods_mac_p.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h index e2539aaaf1..f5a93d98d2 100644 --- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h +++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h @@ -199,19 +199,6 @@ QT_END_NAMESPACE [super setInitialFirstResponder:view]; } -- (void)setInitialFirstResponder:(NSView *)view -{ - // 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]; - if (qwidget) { - qt_event_request_window_change(qwidget); - qt_mac_send_posted_gl_updates(qwidget); - } - - [super setInitialFirstResponder:view]; -} - - (BOOL)makeFirstResponder:(NSResponder *)responder { // For some reason Cocoa wants to flip the first responder |