AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace Q_WS_MAC with Q_OS_MAC in qshortcut.cpp

Browse Source 
This re-enables shortcut context matching for menubar actions.

Change-Id: I0d9f2b3d4316a4611afe96eb1a2cf29cb9e91851
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
This commit is contained in:
Bradley T. Hughes 2012-03-14 14:55:08 +01:00 committed by Qt by Nokia
parent b6bce2dd75
commit 7c7e47493e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/widgets/kernel/qshortcut.cpp
View File

@ -46,6 +46,7 @@
#include <qevent.h> #include <qevent.h>
#include <qwhatsthis.h> #include <qwhatsthis.h>
#include <qmenu.h> #include <qmenu.h>
#include <qmenubar.h>
#include <qapplication.h> #include <qapplication.h>
#include <private/qapplication_p.h> #include <private/qapplication_p.h>
#include <private/qshortcutmap_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) static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidget *active_window)
{ {
bool visible = w->isVisible(); bool visible = w->isVisible();
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
if (!qApp->testAttribute(Qt::AA_DontUseNativeMenuBar) && qobject_cast<QMenuBar *>(w)) if (!qApp->testAttribute(Qt::AA_DontUseNativeMenuBar) && qobject_cast<QMenuBar *>(w))
visible = true; visible = true;
#endif #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) static bool correctGraphicsWidgetContext(Qt::ShortcutContext context, QGraphicsWidget *w, QWidget *active_window)
{ {
bool visible = w->isVisible(); bool visible = w->isVisible();
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
if (!qApp->testAttribute(Qt::AA_DontUseNativeMenuBar) && qobject_cast<QMenuBar *>(w)) if (!qApp->testAttribute(Qt::AA_DontUseNativeMenuBar) && qobject_cast<QMenuBar *>(w))
visible = true; visible = true;
#endif #endif