summaryrefslogtreecommitdiffstats
path: root/mkspecs/devices
diff options
context:
space:
mode:
authorTomasz Olszak <olszak.tomasz@gmail.com>2015-02-26 15:41:16 +0100
committerTomasz Olszak <olszak.tomasz@gmail.com>2015-02-26 15:41:16 +0100
commit9b8366ec47c33fd1cf16902b5e0f39e031c8ac3a (patch)
treeb9519f9a8215ed1e0c0b3d46d39a2d54e70c2d4b /mkspecs/devices
parent47d73278f105bd4ee9bad446d269112972506515 (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
Diffstat (limited to 'mkspecs/devices')
-rw-r--r--mkspecs/devices/linux-g++-tizen-emulator/qmake.conf1
-rw-r--r--mkspecs/devices/linux-g++-tizen-mobile/qmake.conf1
2 files changed, 2 insertions, 0 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)