diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-03-14 14:55:08 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-17 07:06:44 +0100 |
| commit | 7c7e47493edec987569a60e12456de5a2c62a230 (patch) | |
| tree | 521552fbe25a8c2972864f2a3f5bbeca813a28f4 /src/widgets/kernel/qshortcut.cpp | |
| parent | b6bce2dd7565329b2ca2a95c316f81293a6a5fe7 (diff) | |
Replace Q_WS_MAC with Q_OS_MAC in qshortcut.cpp
This re-enables shortcut context matching for menubar actions.
Change-Id: I0d9f2b3d4316a4611afe96eb1a2cf29cb9e91851
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qshortcut.cpp')
| -rw-r--r-- | src/widgets/kernel/qshortcut.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/kernel/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp index 07c7a02d4d..92f6fbafba 100644 --- a/src/widgets/kernel/qshortcut.cpp +++ b/src/widgets/kernel/qshortcut.cpp @@ -46,6 +46,7 @@ #include <qevent.h> #include <qwhatsthis.h> #include <qmenu.h> +#include <qmenubar.h> #include <qapplication.h> #include <private/qapplication_p.h> #include <private/qshortcutmap_p.h> @@ -114,7 +115,7 @@ bool qWidgetShortcutContextMatcher(QObject *object, Qt::ShortcutContext context) static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidget *active_window) { bool visible = w->isVisible(); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC if (!qApp->testAttribute(Qt::AA_DontUseNativeMenuBar) && qobject_cast<QMenuBar *>(w)) visible = true; #endif @@ -177,7 +178,7 @@ static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidge static bool correctGraphicsWidgetContext(Qt::ShortcutContext context, QGraphicsWidget *w, QWidget *active_window) { bool visible = w->isVisible(); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC if (!qApp->testAttribute(Qt::AA_DontUseNativeMenuBar) && qobject_cast<QMenuBar *>(w)) visible = true; #endif |