diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
| commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
| tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/gui/kernel/qkeymapper_p.h | |
| parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
| parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) | |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/gui/kernel/qkeymapper_p.h')
| -rw-r--r-- | src/gui/kernel/qkeymapper_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h index 2607c2a1a9..35f2a63345 100644 --- a/src/gui/kernel/qkeymapper_p.h +++ b/src/gui/kernel/qkeymapper_p.h @@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE class QKeyMapperPrivate; -class QKeyMapper : public QObject +class Q_GUI_EXPORT QKeyMapper : public QObject { Q_OBJECT public: @@ -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: |