diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-05 14:57:37 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-05 14:58:04 +0200 |
commit | 3821d92366548f5ca11c32f1657566ac424ead95 (patch) | |
tree | 66c65f5f6b4aae93e3b37306da0c295402c1e3f8 /src/gui | |
parent | 419ef5f1264ea4c2fbc4f1a656d5e2cf3d9beb83 (diff) |
remove qwidget dependencies from keymapper
Remove the QWidget dependencies from keymapper and
move it back into guikernel.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/guikernel/guikernel.pri | 3 | ||||
-rw-r--r-- | src/gui/guikernel/qkeymapper.cpp (renamed from src/gui/to_be_moved/qkeymapper.cpp) | 3 | ||||
-rw-r--r-- | src/gui/guikernel/qkeymapper_p.h (renamed from src/gui/to_be_moved/qkeymapper_p.h) | 2 | ||||
-rw-r--r-- | src/gui/guikernel/qkeymapper_qpa.cpp (renamed from src/gui/to_be_moved/qkeymapper_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qwindowsysteminterface_qpa.cpp | 2 | ||||
-rw-r--r-- | src/gui/to_be_moved/to_be_moved.pri | 3 |
6 files changed, 7 insertions, 6 deletions
diff --git a/src/gui/guikernel/guikernel.pri b/src/gui/guikernel/guikernel.pri index 7f24adf56c..0a4e4d557d 100644 --- a/src/gui/guikernel/guikernel.pri +++ b/src/gui/guikernel/guikernel.pri @@ -12,6 +12,7 @@ HEADERS += \ guikernel/qevent_p.h \ guikernel/qkeysequence.h \ guikernel/qkeysequence_p.h \ + guikernel/qkeymapper_p.h \ guikernel/qmime.h \ guikernel/qsessionmanager.h \ guikernel/qwindowdefs.h \ @@ -21,6 +22,8 @@ SOURCES += \ guikernel/qcursor.cpp \ guikernel/qevent.cpp \ guikernel/qkeysequence.cpp \ + guikernel/qkeymapper.cpp \ + guikernel/qkeymapper_qpa.cpp \ guikernel/qmime.cpp \ guikernel/qguivariant.cpp \ diff --git a/src/gui/to_be_moved/qkeymapper.cpp b/src/gui/guikernel/qkeymapper.cpp index e38a905ca5..02e0231ecd 100644 --- a/src/gui/to_be_moved/qkeymapper.cpp +++ b/src/gui/guikernel/qkeymapper.cpp @@ -40,11 +40,10 @@ ****************************************************************************/ -#include "qapplication.h" +#include "qguiapplication.h" #include <private/qobject_p.h> #include "qkeymapper_p.h" -#include <qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/to_be_moved/qkeymapper_p.h b/src/gui/guikernel/qkeymapper_p.h index ec2d8492fe..9eff42f88c 100644 --- a/src/gui/to_be_moved/qkeymapper_p.h +++ b/src/gui/guikernel/qkeymapper_p.h @@ -76,11 +76,13 @@ public: static QKeyMapper *instance(); static void changeKeyboard(); +#ifndef Q_WS_QPA static bool sendKeyEvent(QWidget *widget, bool grab, QEvent::Type type, int code, Qt::KeyboardModifiers modifiers, const QString &text, bool autorepeat, int count, quint32 nativeScanCode, quint32 nativeVirtualKey, quint32 nativeModifiers, bool *unusedExceptForCocoa = 0); +#endif static QList<int> possibleKeys(QKeyEvent *e); private: diff --git a/src/gui/to_be_moved/qkeymapper_qpa.cpp b/src/gui/guikernel/qkeymapper_qpa.cpp index 7e4114057f..7e4114057f 100644 --- a/src/gui/to_be_moved/qkeymapper_qpa.cpp +++ b/src/gui/guikernel/qkeymapper_qpa.cpp diff --git a/src/gui/guikernel/qwindowsysteminterface_qpa.cpp b/src/gui/guikernel/qwindowsysteminterface_qpa.cpp index 6c6edb54ae..aece0fec18 100644 --- a/src/gui/guikernel/qwindowsysteminterface_qpa.cpp +++ b/src/gui/guikernel/qwindowsysteminterface_qpa.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qwindowsysteminterface_qpa.h" #include "qwindowsysteminterface_qpa_p.h" -#include "private/qapplication_p.h" +#include "private/qguiapplication_p.h" #include <QAbstractEventDispatcher> QT_BEGIN_NAMESPACE diff --git a/src/gui/to_be_moved/to_be_moved.pri b/src/gui/to_be_moved/to_be_moved.pri index 9967dd82c0..d09c568c69 100644 --- a/src/gui/to_be_moved/to_be_moved.pri +++ b/src/gui/to_be_moved/to_be_moved.pri @@ -6,7 +6,6 @@ HEADERS += \ to_be_moved/qshortcutmap_p.h \ to_be_moved/qdrag.h \ to_be_moved/qdnd_p.h \ - to_be_moved/qkeymapper_p.h SOURCES += \ to_be_moved/qlinecontrol.cpp \ @@ -16,5 +15,3 @@ SOURCES += \ to_be_moved/qdrag.cpp \ to_be_moved/qdnd.cpp \ to_be_moved/qdnd_qpa.cpp \ - to_be_moved/qkeymapper.cpp \ - to_be_moved/qkeymapper_qpa.cpp \ |