diff options
| author | Tomasz Olszak <olszak.tomasz@gmail.com> | 2015-02-26 15:41:16 +0100 |
|---|---|---|
| committer | Tomasz Olszak <olszak.tomasz@gmail.com> | 2015-02-26 15:41:16 +0100 |
| commit | 9b8366ec47c33fd1cf16902b5e0f39e031c8ac3a (patch) | |
| tree | b9519f9a8215ed1e0c0b3d46d39a2d54e70c2d4b | |
| parent | 47d73278f105bd4ee9bad446d269112972506515 (diff) | |
Setting DFLT_XKB_CONFIG_ROOT only if not defined.
Now it is possible to set DFLT_XKB_CONFIG_ROOT from
devices mkspecs.
Change-Id: Ica503625e9b8126b16aaf7f80e7ec2833ea33763
Reviewed-by: Jarosław Staniek <staniek@kde.org>
Conflicts:
src/3rdparty/xkbcommon.pri
| -rw-r--r-- | mkspecs/devices/linux-g++-tizen-emulator/qmake.conf | 1 | ||||
| -rw-r--r-- | mkspecs/devices/linux-g++-tizen-mobile/qmake.conf | 1 | ||||
| -rw-r--r-- | src/3rdparty/xkbcommon.pri | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/devices/linux-g++-tizen-emulator/qmake.conf b/mkspecs/devices/linux-g++-tizen-emulator/qmake.conf index e3e2d2c172..a4edbf06f2 100644 --- a/mkspecs/devices/linux-g++-tizen-emulator/qmake.conf +++ b/mkspecs/devices/linux-g++-tizen-emulator/qmake.conf @@ -27,5 +27,6 @@ include(../common/linux_tizen_device_pre.conf) DEFINES += Q_OS_LINUX_TIZEN_SIMULATOR QT_QPA_DEFAULT_PLATFORM = xcb +DEFINES += DFLT_XKB_CONFIG_ROOT='\\"/etc/X11/xkb\\"' load(qt_config) diff --git a/mkspecs/devices/linux-g++-tizen-mobile/qmake.conf b/mkspecs/devices/linux-g++-tizen-mobile/qmake.conf index 62009c2e10..8fa67b68c6 100644 --- a/mkspecs/devices/linux-g++-tizen-mobile/qmake.conf +++ b/mkspecs/devices/linux-g++-tizen-mobile/qmake.conf @@ -4,5 +4,6 @@ include(../common/linux_tizen_device_pre.conf) DEFINES += Q_OS_LINUX_TIZEN_MOBILE QT_QPA_DEFAULT_PLATFORM = xcb +DEFINES += DFLT_XKB_CONFIG_ROOT='\\"/etc/X11/xkb\\"' load(qt_config) diff --git a/src/3rdparty/xkbcommon.pri b/src/3rdparty/xkbcommon.pri index eaef4749db..b5b781f3c9 100644 --- a/src/3rdparty/xkbcommon.pri +++ b/src/3rdparty/xkbcommon.pri @@ -4,7 +4,7 @@ INCLUDEPATH += $$PWD/xkbcommon \ $$PWD/xkbcommon/src \ $$PWD/xkbcommon/src/xkbcomp -DEFINES += DFLT_XKB_CONFIG_ROOT='\\"$$QMAKE_XKB_CONFIG_ROOT\\"' +!contains(DEFINES, DFLT_XKB_CONFIG_ROOT.*): DEFINES += DFLT_XKB_CONFIG_ROOT='\\"$$QMAKE_XKB_CONFIG_ROOT\\"' ### RMLVO names can be overwritten with environmental variables (see libxkbcommon documentation) DEFINES += DEFAULT_XKB_RULES='\\"evdev\\"' |