From 2122e731abdb619249df89642c0800640b2fa428 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Thu, 11 Apr 2013 10:51:49 +0200 Subject: Add libxkbcommon to 3rd party libs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This library is required by the XCB platform plugin. As we depend on very recent version of this library and it might not be available in base repositories of distributions, users can use -qt-xkbcommom switch to build Qt with the bundled version. Change-Id: I0ed2a5cc2f1df98b0e7cc926cabfa69818674e08 Reviewed-by: Samuel Rødal --- src/plugins/platforminputcontexts/compose/compose.pro | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/plugins/platforminputcontexts/compose/compose.pro') diff --git a/src/plugins/platforminputcontexts/compose/compose.pro b/src/plugins/platforminputcontexts/compose/compose.pro index 6387a47a4c..8c73d29971 100644 --- a/src/plugins/platforminputcontexts/compose/compose.pro +++ b/src/plugins/platforminputcontexts/compose/compose.pro @@ -17,4 +17,13 @@ HEADERS += $$PWD/qcomposeplatforminputcontext.h \ $$PWD/generator/qtablegenerator.h \ $$PWD/xkbcommon_workaround.h \ +# libxkbcommon +contains(QT_CONFIG, xkbcommon-qt): { + include(../../../3rdparty/xkbcommon.pri) +} else { + LIBS += $$QMAKE_LIBS_XKBCOMMON + QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON + LIBS += -lxkbcommon +} + OTHER_FILES += $$PWD/compose.json -- cgit v1.2.3