diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-18 09:38:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-18 09:38:34 (GMT) |
| commit | 3c0a4a16fa857fcf6ec89ef6e3376b262eaeca62 (patch) | |
| tree | e7f3046fc23e0649cbad626bd530813492993a92 | |
| parent | 6e671ae5ec41b93a0e570c7e0ec79ede698e486e (diff) | |
| parent | 5949c215bd53582d0c6481f606a9ec015f067b37 (diff) | |
| download | Qt-3c0a4a16fa857fcf6ec89ef6e3376b262eaeca62.zip Qt-3c0a4a16fa857fcf6ec89ef6e3376b262eaeca62.tar.gz Qt-3c0a4a16fa857fcf6ec89ef6e3376b262eaeca62.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Cocoa: fix crash when using a drawer with a focus widget
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index 749472a..d9f428c 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -1115,7 +1115,7 @@ static int qCocoaViewCount = 0; - (BOOL)resignFirstResponder { if (!qwidget) - return NO; + return YES; // Seems like the following test only triggers if this // view is inside a QMacNativeWidget: if (qwidget == QApplication::focusWidget()) |