1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure X11 paths are properly set in plugins

Browse Source 
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>
This commit is contained in:
Kai Koehne 2016-10-06 12:26:44 +02:00
parent 2e749afc5a
commit 85023e1d72
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/xkbcommon.pri vendored
View File

@ -4,6 +4,8 @@ INCLUDEPATH += $$PWD/xkbcommon \
$$PWD/xkbcommon/src \ $$PWD/xkbcommon/src \
$$PWD/xkbcommon/src/xkbcomp $$PWD/xkbcommon/src/xkbcomp
include($$shadowed($$PWD/../gui/qtgui-config.pri))
DEFINES += DFLT_XKB_CONFIG_ROOT='\\"$$QMAKE_XKB_CONFIG_ROOT\\"' DEFINES += DFLT_XKB_CONFIG_ROOT='\\"$$QMAKE_XKB_CONFIG_ROOT\\"'
### RMLVO names can be overwritten with environmental variables (see libxkbcommon documentation) ### RMLVO names can be overwritten with environmental variables (see libxkbcommon documentation)

6
src/plugins/platforminputcontexts/compose/compose.pro
View File

@ -2,8 +2,6 @@ TARGET = composeplatforminputcontextplugin
QT += core-private gui-private QT += core-private gui-private
DEFINES += X11_PREFIX='\\"$$QMAKE_X11_PREFIX\\"'
SOURCES += $$PWD/qcomposeplatforminputcontextmain.cpp \ SOURCES += $$PWD/qcomposeplatforminputcontextmain.cpp \
$$PWD/qcomposeplatforminputcontext.cpp \ $$PWD/qcomposeplatforminputcontext.cpp \
$$PWD/generator/qtablegenerator.cpp \ $$PWD/generator/qtablegenerator.cpp \
@ -18,6 +16,10 @@ HEADERS += $$PWD/qcomposeplatforminputcontext.h \
QMAKE_USE += xkbcommon QMAKE_USE += xkbcommon
} }
include($$OUT_PWD/../../../gui/qtgui-config.pri)
DEFINES += X11_PREFIX='\\"$$QMAKE_X11_PREFIX\\"'
OTHER_FILES += $$PWD/compose.json OTHER_FILES += $$PWD/compose.json
PLUGIN_TYPE = platforminputcontexts PLUGIN_TYPE = platforminputcontexts