diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,11 +33,11 @@ QuickControls2 Sql Widgets - X11Extras Xml XmlPatterns ) +find_package(Qt5X11Extras) find_package(Qt5 CONFIG QUIET OPTIONAL_COMPONENTS QuickCompiler) find_package(KF5 REQUIRED COMPONENTS diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -25,7 +25,6 @@ * Qt Quick Controls 2 * Qt SQL * Qt Test - * Qt X11 Extras * Qt XML * Qt XML Patterns * [KDE Frameworks 5][kf5] with: @@ -45,6 +44,7 @@ * XmlGui * IconThemes * optionally, for keyboard layout auto-detection: + * Qt X11 Extras * [Xlib][xlib] * [XKB][xkb] * [libxkbfile][libxkbfile] diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,11 +7,11 @@ find_package(X11) find_package(XCB OPTIONAL_COMPONENTS XCB XKB) -if (X11_FOUND AND X11_Xkbfile_FOUND AND X11_Xkb_FOUND AND XCB_FOUND AND XCB_XKB_FOUND) +if (Qt5X11Extras_FOUND AND X11_FOUND AND X11_Xkbfile_FOUND AND X11_Xkb_FOUND AND XCB_FOUND AND XCB_XKB_FOUND) set(KTOUCH_BUILD_WITH_X11 TRUE) endif() -add_feature_info ("Keyboard Layout Detection" KTOUCH_BUILD_WITH_X11 "needs libX11, libxkb, libxkbfile, libxcb, and libxcb-xkb") +add_feature_info ("Keyboard Layout Detection" KTOUCH_BUILD_WITH_X11 "needs Qt5X11Extras, libX11, libxkb, libxkbfile, libxcb, and libxcb-xkb") ecm_optional_add_subdirectory(schemata) @@ -117,7 +117,7 @@ include_directories(${X11_Xkb_INCLUDE_PATH}) include_directories(${X11_Xkbfile_INCLUDE_PATH}) set(ktouch_SRCS ${ktouch_SRCS} x11_helper.cpp) - set(ktouch_X11_DEPS ${X11_Xkb_LIB} ${X11_LIBRARIES} XCB::XCB XCB::XKB) + set(ktouch_X11_DEPS Qt5::X11Extras ${X11_Xkb_LIB} ${X11_LIBRARIES} XCB::XCB XCB::XKB) else () set(ktouch_SRCS ${ktouch_SRCS} keyboardlayoutmenu.cpp) endif () @@ -135,7 +135,6 @@ Qt5::QuickControls2 Qt5::Sql Qt5::XmlPatterns - Qt5::X11Extras KF5::Completion KF5::ConfigWidgets KF5::Declarative