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.
This commit is contained in:
Qt Continuous Integration System 2011-05-25 17:12:22 +10:00
commit 1a74e8246a

View File

@ -199,19 +199,6 @@ QT_END_NAMESPACE
[super setInitialFirstResponder:view]; [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 - (BOOL)makeFirstResponder:(NSResponder *)responder
{ {
// For some reason Cocoa wants to flip the first responder // For some reason Cocoa wants to flip the first responder