summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjasplin <qt-info@nokia.com>2009-06-05 11:46:14 (GMT)
committerjasplin <qt-info@nokia.com>2009-06-05 11:55:36 (GMT)
commita45ba34ead80d7e19e62eff571d094c9417fd876 (patch)
tree92db026fc0f43850c91121115b8efc6adb08b720
parent5740b034811794e0c33496cf0eeb81ba471cc018 (diff)
downloadQt-a45ba34ead80d7e19e62eff571d094c9417fd876.zip
Qt-a45ba34ead80d7e19e62eff571d094c9417fd876.tar.gz
Qt-a45ba34ead80d7e19e62eff571d094c9417fd876.tar.bz2
Revert "BT: Fixed crash on Mac caused by erroneous handling of native focus events."
This reverts commit 7314c07a3e443b1d5349b419a03db8d41ca43f7e. As reported by Eike, this patch caused several problems for Qt Creator. Potentially it may cause problems for other (external) applications as well. An alternative fix (scheduled for 4.5.x) needs to be found for tasks 254456 and 254460. Reviewed-by: Richard Moe Gustavsen
-rw-r--r--src/gui/kernel/qwidget_mac.mm5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 68eaf6f..b2256cd 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -1296,11 +1296,8 @@ OSStatus QWidgetPrivate::qt_widget_event(EventHandlerCallRef er, EventRef event,
if(part == kControlFocusNoPart){
if (widget->hasFocus())
QApplicationPrivate::setFocusWidget(0, Qt::OtherFocusReason);
- } else if (widget->focusPolicy() != Qt::NoFocus) {
+ } else
widget->setFocus();
- } else {
- handled_event = false;
- }
}
if(!HIObjectIsOfClass((HIObjectRef)hiview, kObjectQWidget))
CallNextEventHandler(er, event);