diff options
author | Fabien Freling <fabien.freling@nokia.com> | 2011-03-15 15:09:06 +0100 |
---|---|---|
committer | Fabien Freling <fabien.freling@nokia.com> | 2011-03-15 15:09:06 +0100 |
commit | b36f947147e3f5acf444c94d6e2a608506b7e753 (patch) | |
tree | a0bf253b8e315305cfada01871f3a1cbf54aef43 /src/gui/kernel/qcocoasharedwindowmethods_mac_p.h | |
parent | d524e983c60ba59f3c65d811ec92f02c97d1a8ab (diff) | |
parent | c0cd8db0498daaa8151d1f80143b6849016bdc7c (diff) |
Merge remote branch 'mainline/master' into merge_raster
Diffstat (limited to 'src/gui/kernel/qcocoasharedwindowmethods_mac_p.h')
-rw-r--r-- | src/gui/kernel/qcocoasharedwindowmethods_mac_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h index 662b825c87..7d41f3d791 100644 --- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h +++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h @@ -88,6 +88,8 @@ QT_END_NAMESPACE QWidget *widget = [self QT_MANGLE_NAMESPACE(qt_qwidget)]; if (!widget) return NO; // This should happen only for qt_root_win + if (QApplicationPrivate::isBlockedByModal(widget)) + return NO; bool isToolTip = (widget->windowType() == Qt::ToolTip); bool isPopup = (widget->windowType() == Qt::Popup); @@ -99,6 +101,8 @@ QT_END_NAMESPACE QWidget *widget = [self QT_MANGLE_NAMESPACE(qt_qwidget)]; if (!widget) return NO; // This should happen only for qt_root_win + if ([self isSheet]) + return NO; bool isToolTip = (widget->windowType() == Qt::ToolTip); bool isPopup = (widget->windowType() == Qt::Popup); |