summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qapplication_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/widgets/kernel/qapplication_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/widgets/kernel/qapplication_p.h')
-rw-r--r--src/widgets/kernel/qapplication_p.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h
index 77a02bd5ab..d0674d4585 100644
--- a/src/widgets/kernel/qapplication_p.h
+++ b/src/widgets/kernel/qapplication_p.h
@@ -68,7 +68,6 @@
#include "QtCore/qhash.h"
#include "QtCore/qpointer.h"
#include "private/qcoreapplication_p.h"
-#include "private/qshortcutmap_p.h"
#include <private/qthread_p.h>
#include "QtCore/qpoint.h"
#include <QTime>
@@ -367,9 +366,6 @@ public:
QBasicTimer toolTipWakeUp, toolTipFallAsleep;
QPoint toolTipPos, toolTipGlobalPos, hoverGlobalPos;
QPointer<QWidget> toolTipWidget;
-#ifndef QT_NO_SHORTCUT
- QShortcutMap shortcutMap;
-#endif
static QInputContext *inputContext;