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/plugins/platforminputcontexts | |
| 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/plugins/platforminputcontexts')
| -rw-r--r-- | src/plugins/platforminputcontexts/compose/compose.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforminputcontexts/compose/compose.pro b/src/plugins/platforminputcontexts/compose/compose.pro index 17284874f6..2f53c5b416 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 |