From 85023e1d7254e69a997247899ec23ca12f58b054 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 6 Oct 2016 12:26:44 +0200 Subject: [PATCH] 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 Reviewed-by: Oswald Buddenhagen --- src/3rdparty/xkbcommon.pri | 2 ++ src/plugins/platforminputcontexts/compose/compose.pro | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/xkbcommon.pri b/src/3rdparty/xkbcommon.pri index 12e7a4d8a3d..af71b232d5b 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) diff --git a/src/plugins/platforminputcontexts/compose/compose.pro b/src/plugins/platforminputcontexts/compose/compose.pro index 17284874f6d..2f53c5b416a 100644 --- a/src/plugins/platforminputcontexts/compose/compose.pro +++ b/src/plugins/platforminputcontexts/compose/compose.pro @@ -2,8 +2,6 @@ TARGET = composeplatforminputcontextplugin QT += core-private gui-private -DEFINES += X11_PREFIX='\\"$$QMAKE_X11_PREFIX\\"' - SOURCES += $$PWD/qcomposeplatforminputcontextmain.cpp \ $$PWD/qcomposeplatforminputcontext.cpp \ $$PWD/generator/qtablegenerator.cpp \ @@ -18,6 +16,10 @@ HEADERS += $$PWD/qcomposeplatforminputcontext.h \ QMAKE_USE += xkbcommon } +include($$OUT_PWD/../../../gui/qtgui-config.pri) + +DEFINES += X11_PREFIX='\\"$$QMAKE_X11_PREFIX\\"' + OTHER_FILES += $$PWD/compose.json PLUGIN_TYPE = platforminputcontexts