diff options
| author | Gatis Paeglis <gatis.paeglis@digia.com> | 2013-04-29 20:26:25 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-07 22:43:14 +0200 |
| commit | a2a8a9ea0159cc6239737de2d745129f01c94d37 (patch) | |
| tree | 2803fcfeb60e616e817aa422e3b1a6982c0cac3b /src/plugins/platforminputcontexts/compose/compose.pro | |
| parent | 43578e1901ab56e6df3e58db21e3e52a28cd9eae (diff) | |
Make access to xkbcommon_workaround.h more generic
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 <oswald.buddenhagen@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/plugins/platforminputcontexts/compose/compose.pro')
| -rw-r--r-- | src/plugins/platforminputcontexts/compose/compose.pro | 5 |
1 files changed, 4 insertions, 1 deletions
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 |