summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget.cpp
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-08-24 13:40:35 (GMT)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-08-25 09:50:43 (GMT)
commitf29e1bc7b7a593ef65defa3543b0feea455c7cdb (patch)
tree5ecc60a34015593b57d31a4efddd4c6c3868307f /src/gui/kernel/qwidget.cpp
parent913d75047dd5aa4a8e1d9b51a58c7be7e75f3d89 (diff)
downloadQt-f29e1bc7b7a593ef65defa3543b0feea455c7cdb.zip
Qt-f29e1bc7b7a593ef65defa3543b0feea455c7cdb.tar.gz
Qt-f29e1bc7b7a593ef65defa3543b0feea455c7cdb.tar.bz2
Cocoa: bugfix for autocads plugin project
Seems like the QMacNativeWidget was almost not testet at all. It all breaks down when embedding QLineEdits (with respect to focus). This is a first patch that fixes this issue.
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
-rw-r--r--src/gui/kernel/qwidget.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 5e720df..6ffac2c 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -6231,6 +6231,10 @@ bool QWidget::isActiveWindow() const
if(qt_mac_is_macdrawer(tlw) &&
tlw->parentWidget() && tlw->parentWidget()->isActiveWindow())
return true;
+
+ extern bool qt_mac_insideKeyWindow(const QWidget *); //qwidget_mac.cpp
+ if (QApplication::testAttribute(Qt::AA_MacPluginApplication) && qt_mac_insideKeyWindow(tlw))
+ return true;
#endif
if(style()->styleHint(QStyle::SH_Widget_ShareActivation, 0, this)) {
if(tlw->windowType() == Qt::Tool &&