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

diff --git a/mkspecs/devices/linux-g++-tizen-emulator/qmake.conf b/mkspecs/devices/linux-g++-tizen-emulator/qmake.conf
index e3e2d2c172a6cc27db1a312bf84b94b424003974..a4edbf06f2ef102a4937c130f64efe3373a2ef87 100644 (file)
--- 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 62009c2e10f5c79c22357d996971bd1d9702d86c..8fa67b68c6e9a855ce277208df2eb6de8ba34d7d 100644 (file)
--- 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 eaef4749dbbe8992d00b65d2f6823043d16182e4..b5b781f3c9e56b5fc9a7054721e60b7d9087171a 100644 (file)
--- 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\\"'