diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2016-10-06 12:26:44 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2016-10-06 19:04:36 +0000 |
| commit | 85023e1d7254e69a997247899ec23ca12f58b054 (patch) | |
| tree | 5b9866de6947bc9641c2429cc59a7c600b5cf39f /src/3rdparty/xkbcommon.pri | |
| parent | 2e749afc5a1b9b36846c3b60e533f1ef67ee6e73 (diff) | |
Make sure X11 paths are properly set in plugins
QMAKE_X11_PREFIX and QMAKE_XKB_CONFIG_ROOT are now configured
in qtgui, so we need to include qtgui-config.pri before accessing
them in plugins.
Task-number: QTBUG-56351
Change-Id: I2e18f0b03f826a93a9d9a1965bd024ee89656ae8
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/3rdparty/xkbcommon.pri')
| -rw-r--r-- | src/3rdparty/xkbcommon.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/xkbcommon.pri b/src/3rdparty/xkbcommon.pri index 12e7a4d8a3..af71b232d5 100644 --- a/src/3rdparty/xkbcommon.pri +++ b/src/3rdparty/xkbcommon.pri @@ -4,6 +4,8 @@ INCLUDEPATH += $$PWD/xkbcommon \ $$PWD/xkbcommon/src \ $$PWD/xkbcommon/src/xkbcomp +include($$shadowed($$PWD/../gui/qtgui-config.pri)) + DEFINES += DFLT_XKB_CONFIG_ROOT='\\"$$QMAKE_XKB_CONFIG_ROOT\\"' ### RMLVO names can be overwritten with environmental variables (see libxkbcommon documentation) |