From a2a8a9ea0159cc6239737de2d745129f01c94d37 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Mon, 29 Apr 2013 20:26:25 +0200 Subject: Make access to xkbcommon_workaround.h more generic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It makes more sense to keep this workaround header together with the other libxkbcommon files for a better access point since it's used by several *.pro files. Change-Id: I63d4eb58f6e7f3852834e41c4b6e058a2c962233 Reviewed-by: Oswald Buddenhagen Reviewed-by: Samuel Rødal --- src/plugins/platforminputcontexts/compose/compose.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (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 1bfd46ebca..2490a4ffbe 100644 --- a/src/plugins/platforminputcontexts/compose/compose.pro +++ b/src/plugins/platforminputcontexts/compose/compose.pro @@ -15,7 +15,6 @@ SOURCES += $$PWD/main.cpp \ HEADERS += $$PWD/qcomposeplatforminputcontext.h \ $$PWD/generator/qtablegenerator.h \ - $$PWD/xkbcommon_workaround.h \ # libxkbcommon contains(QT_CONFIG, xkbcommon-qt): { @@ -23,6 +22,10 @@ contains(QT_CONFIG, xkbcommon-qt): { } else { LIBS += $$QMAKE_LIBS_XKBCOMMON QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON + equals(QMAKE_VERSION_XKBCOMMON, "0.2.0") { + DEFINES += XKBCOMMON_0_2_0 + INCLUDEPATH += ../../../3rdparty/xkbcommon/xkbcommon/ + } } OTHER_FILES += $$PWD/compose.json -- cgit v1.2.3