From 85023e1d7254e69a997247899ec23ca12f58b054 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Thu, 6 Oct 2016 12:26:44 +0200
Subject: 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>
---
 src/3rdparty/xkbcommon.pri | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/3rdparty/xkbcommon.pri')

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)
-- 
cgit v1.2.3