diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-06-28 10:56:30 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-06-28 11:02:11 (GMT) |
| commit | 6b54dc34fdaebeb5d62ea42ab94d5e18679ae5b5 (patch) | |
| tree | 1e7eb5a3f2f75c82e5f4af8faae01023e1b16fe1 /src/gui/kernel/qwidget_mac.mm | |
| parent | fd460a23cbfeaaefb6c870987206de373bfab826 (diff) | |
| download | Qt-6b54dc34fdaebeb5d62ea42ab94d5e18679ae5b5.zip Qt-6b54dc34fdaebeb5d62ea42ab94d5e18679ae5b5.tar.gz Qt-6b54dc34fdaebeb5d62ea42ab94d5e18679ae5b5.tar.bz2 | |
Mac: respect WA_ShowWithoutActivating flag
Seems like we just made any window key when showing it, regardless
if WA_ShowWithoutActivating was set. This patch will fix this.
Rev-By: msorvig
Diffstat (limited to 'src/gui/kernel/qwidget_mac.mm')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 778f1f1..225a296 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -3490,7 +3490,10 @@ void QWidgetPrivate::show_sys() QWidget *top = 0; if (QApplicationPrivate::tryModalHelper(q, &top)) { - [window makeKeyAndOrderFront:window]; + if (q->testAttribute(Qt::WA_ShowWithoutActivating)) + [window orderFront:window]; + else + [window makeKeyAndOrderFront:window]; // If this window is app modal, we need to start spinning // a modal session for it. Interrupting // the event dispatcher will make this happend: |