summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qguiapplication_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-10-13 09:47:23 +0200
committerQt by Nokia <qt-info@nokia.com>2011-11-21 15:53:16 +0100
commit479f3c6b1124bc830ee60e764ea50d14db526f7e (patch)
treeb25ee7f28b66759a7512c35a7868fa1f7e36563e /src/gui/kernel/qguiapplication_p.h
parent6e7f08182ea9a6e0e4f89c6b13ff8dcae1d3b87c (diff)
Pass all key events through the shortcutmap
This has to happen in QGuiApp, not QApp. Change-Id: If8a6e81df3ae9b601733d077cce57d2d21572f74 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/kernel/qguiapplication_p.h')
-rw-r--r--src/gui/kernel/qguiapplication_p.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index af1c71d478..255a1587f5 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -53,6 +53,7 @@
#include "private/qwindowsysteminterface_qpa_p.h"
#include <QtGui/qplatformintegration_qpa.h>
#include <QtGui/qplatformtheme_qpa.h>
+#include "private/qshortcutmap_p.h"
QT_BEGIN_HEADER
@@ -183,6 +184,9 @@ public:
static bool quitOnLastWindowClosed;
static QList<QObject *> generic_plugin_list;
+#ifndef QT_NO_SHORTCUT
+ QShortcutMap shortcutMap;
+#endif
private:
void init();