From 479f3c6b1124bc830ee60e764ea50d14db526f7e Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Thu, 13 Oct 2011 09:47:23 +0200
Subject: Pass all key events through the shortcutmap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This has to happen in QGuiApp, not QApp.

Change-Id: If8a6e81df3ae9b601733d077cce57d2d21572f74
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/gui/kernel/qguiapplication_p.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/gui/kernel/qguiapplication_p.h')

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();
-- 
cgit v1.2.3