From 792a99438707c78ed96a1b066489f9100c24a922 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 16 Aug 2016 10:17:23 +0200 Subject: Clean up xkbcommon.pri Don't set a variable in QT_CONFIG to build the right things. Instead have an xkbcommon-x11.pri in addition to xkbcommon.pri that also builds the x11 specific things. Change-Id: I16a5f0bcb39b7f4039583a676b6c14b0e073a37f Reviewed-by: Lars Knoll Reviewed-by: Oswald Buddenhagen --- src/3rdparty/xkbcommon-x11.pri | 10 ++++++++++ src/3rdparty/xkbcommon.pri | 11 ----------- src/plugins/platforminputcontexts/compose/compose.pro | 2 -- src/plugins/platforms/xcb/xcb_qpa_lib.pro | 3 +-- 4 files changed, 11 insertions(+), 15 deletions(-) create mode 100644 src/3rdparty/xkbcommon-x11.pri diff --git a/src/3rdparty/xkbcommon-x11.pri b/src/3rdparty/xkbcommon-x11.pri new file mode 100644 index 0000000000..36f22ce9cc --- /dev/null +++ b/src/3rdparty/xkbcommon-x11.pri @@ -0,0 +1,10 @@ +include(xkbcommon.pri) + +# Build xkbcommon-x11 support library, it depends on -lxcb and -lxcb-xkb, linking is done +# in xcb-plugin.pro (linked to system libraries or if Qt was configured with -qt-xcb then +# linked to -lxcb-static). +INCLUDEPATH += $$PWD/xkbcommon/src/x11 +SOURCES += \ + $$PWD/xkbcommon/src/x11/util.c \ + $$PWD/xkbcommon/src/x11/x11-keymap.c \ # renamed: keymap.c -> x11-keymap.c + $$PWD/xkbcommon/src/x11/x11-state.c # renamed: state.c -> x11-state.c diff --git a/src/3rdparty/xkbcommon.pri b/src/3rdparty/xkbcommon.pri index cfffa97369..12e7a4d8a3 100644 --- a/src/3rdparty/xkbcommon.pri +++ b/src/3rdparty/xkbcommon.pri @@ -47,15 +47,4 @@ SOURCES += \ $$PWD/xkbcommon/src/xkbcomp/xkbcomp.c \ $$PWD/xkbcommon/src/xkbcomp/parser.c -qtConfig(xkb):contains(QT_CONFIG, use-xkbcommon-x11support): { - # Build xkbcommon-x11 support library, it depends on -lxcb and -lxcb-xkb, linking is done - # in xcb-plugin.pro (linked to system libraries or if Qt was configured with -qt-xcb then - # linked to -lxcb-static). - INCLUDEPATH += $$PWD/xkbcommon/src/x11 - SOURCES += \ - $$PWD/xkbcommon/src/x11/util.c \ - $$PWD/xkbcommon/src/x11/x11-keymap.c \ # renamed: keymap.c -> x11-keymap.c - $$PWD/xkbcommon/src/x11/x11-state.c # renamed: state.c -> x11-state.c -} - TR_EXCLUDE += $$PWD/* diff --git a/src/plugins/platforminputcontexts/compose/compose.pro b/src/plugins/platforminputcontexts/compose/compose.pro index df61873902..43ddf0d00b 100644 --- a/src/plugins/platforminputcontexts/compose/compose.pro +++ b/src/plugins/platforminputcontexts/compose/compose.pro @@ -13,8 +13,6 @@ HEADERS += $$PWD/qcomposeplatforminputcontext.h \ # libxkbcommon contains(QT_CONFIG, xkbcommon-qt): { - # dont't need x11 dependency for compose key plugin - QT_CONFIG -= use-xkbcommon-x11support include(../../../3rdparty/xkbcommon.pri) } else { QMAKE_USE += xkbcommon diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index c496fb7452..f995249c0d 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -86,8 +86,7 @@ contains(QT_CONFIG, xcb-qt) { # libxkbcommon contains(QT_CONFIG, xkbcommon-qt) { - QT_CONFIG += use-xkbcommon-x11support - include(../../../3rdparty/xkbcommon.pri) + include(../../../3rdparty/xkbcommon-x11.pri) } else { QMAKE_USE += xkbcommon } -- cgit v1.2.3