summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qkeymapper_x11.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-01-06 13:01:53 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-01-06 13:08:27 (GMT)
commit5c3010cf467d437ccfc8a263bed167e979614504 (patch)
treeb91abfc188da458fd1161421b41811ad2c9e3b16 /src/gui/kernel/qkeymapper_x11.cpp
parent97e045f48a331ff97b87bd207fb811277a4fa695 (diff)
downloadQt-5c3010cf467d437ccfc8a263bed167e979614504.zip
Qt-5c3010cf467d437ccfc8a263bed167e979614504.tar.gz
Qt-5c3010cf467d437ccfc8a263bed167e979614504.tar.bz2
qkeymapper_x11.cpp: fix compilation with LSB and without XKB
Task-number: QTBUG-16312 Reviewed-by: Marius Storm-Olsen
Diffstat (limited to 'src/gui/kernel/qkeymapper_x11.cpp')
-rw-r--r--src/gui/kernel/qkeymapper_x11.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
index 825edbc..e085d11 100644
--- a/src/gui/kernel/qkeymapper_x11.cpp
+++ b/src/gui/kernel/qkeymapper_x11.cpp
@@ -61,13 +61,6 @@
#include <ctype.h>
-QT_BEGIN_NAMESPACE
-
-#ifndef QT_NO_XKB
-
-// bring in the auto-generated xkbLayoutData
-#include "qkeymapper_x11_p.cpp"
-
#ifdef QT_LINUXBASE
// LSB's IsKeypadKey define is wrong - see
// http://bugs.linuxbase.org/show_bug.cgi?id=2521
@@ -80,6 +73,13 @@ QT_BEGIN_NAMESPACE
(((KeySym)(keysym) >= 0x11000000) && ((KeySym)(keysym) <= 0x1100FFFF))
#endif
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_NO_XKB
+
+// bring in the auto-generated xkbLayoutData
+#include "qkeymapper_x11_p.cpp"
+
QLocale q_getKeyboardLocale(const QByteArray &layoutName, const QByteArray &variantName)
{
int i = 0;
@@ -92,7 +92,6 @@ QLocale q_getKeyboardLocale(const QByteArray &layoutName, const QByteArray &vari
}
#endif // QT_NO_XKB
-
// from qapplication_x11.cpp
extern uchar qt_alt_mask;
extern uchar qt_meta_mask;