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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/gui/kernel/qkeymapper.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp index 46e6c0cde9..4ee7d66dd8 100644 --- a/src/gui/kernel/qkeymapper.cpp +++ b/src/gui/kernel/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 @@ -91,6 +90,8 @@ void QKeyMapper::changeKeyboard() { instance()->d_func()->clearMappings(); + // ## TODO: Support KeyboardLayoutChange on QPA +#if 0 // inform all toplevel widgets of the change QEvent e(QEvent::KeyboardLayoutChange); QWidgetList list = QApplication::topLevelWidgets(); @@ -98,6 +99,7 @@ void QKeyMapper::changeKeyboard() QWidget *w = list.at(i); qt_sendSpontaneousEvent(w, &e); } +#endif } Q_GLOBAL_STATIC(QKeyMapper, keymapper) |