From 4ceef8a3a6d64474344cac4a6ed4b32b09d38367 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 15 Sep 2020 15:24:47 +0200 Subject: Make xkb a private dependency of QtGui It should not be necessary to have the xkb dev package installed for users of QtGui. Task-number: QTBUG-86421 Change-Id: I4a4102d578df504d23f504a97704fcab4a39023b Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor --- src/platformsupport/input/.prev_CMakeLists.txt | 5 +++++ src/platformsupport/input/CMakeLists.txt | 5 +++++ src/platformsupport/input/libinput/libinput.pri | 1 + 3 files changed, 11 insertions(+) (limited to 'src/platformsupport/input') diff --git a/src/platformsupport/input/.prev_CMakeLists.txt b/src/platformsupport/input/.prev_CMakeLists.txt index 63f88bbb63..b2e9579032 100644 --- a/src/platformsupport/input/.prev_CMakeLists.txt +++ b/src/platformsupport/input/.prev_CMakeLists.txt @@ -77,6 +77,11 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput PkgConfig::Libudev ) +qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon + LIBRARIES + XKB::XKB +) + qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput SOURCES shared/devicehandlerlist_p.h diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt index 2c2a9fa1cc..5b0c310418 100644 --- a/src/platformsupport/input/CMakeLists.txt +++ b/src/platformsupport/input/CMakeLists.txt @@ -82,6 +82,11 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput PkgConfig::Libudev ) +qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon + LIBRARIES + XKB::XKB +) + qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput SOURCES shared/devicehandlerlist_p.h diff --git a/src/platformsupport/input/libinput/libinput.pri b/src/platformsupport/input/libinput/libinput.pri index 74164a3c9b..8b13da1933 100644 --- a/src/platformsupport/input/libinput/libinput.pri +++ b/src/platformsupport/input/libinput/libinput.pri @@ -11,5 +11,6 @@ SOURCES += \ $$PWD/qlibinputtouch.cpp QMAKE_USE_PRIVATE += libudev libinput +qtConfig(xkbcommon): QMAKE_USE_PRIVATE += xkbcommon INCLUDEPATH += $$PWD/../shared -- cgit v1.2.3