napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keyboard: require QtDBus at top-level, tidy includes

Browse Source
This commit is contained in:
Adriaan de Groot 2023-08-29 14:37:01 +02:00
parent 7157ed3854
commit 3fc8febeea
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -292,12 +292,11 @@ add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050f00)
### DEPENDENCIES ### DEPENDENCIES
# #
find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Concurrent Core Gui LinguistTools Network Svg Widgets) find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Concurrent Core DBus Gui LinguistTools Network Svg Widgets)
if(WITH_QML) if(WITH_QML)
find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Quick QuickWidgets) find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Quick QuickWidgets)
endif() endif()
# Optional Qt parts # Note that some modules need more Qt modules, optionally.
find_package(Qt5DBus CONFIG)
find_package(YAMLCPP ${YAMLCPP_VERSION} REQUIRED) find_package(YAMLCPP ${YAMLCPP_VERSION} REQUIRED)
if(INSTALL_POLKIT) if(INSTALL_POLKIT)

2
src/modules/keyboard/CMakeLists.txt
View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: BSD-2-Clause # SPDX-License-Identifier: BSD-2-Clause
# #
find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus)
calamares_add_plugin(keyboard calamares_add_plugin(keyboard
TYPE viewmodule TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO EXPORT_MACRO PLUGINDLLEXPORT_PRO

6
src/modules/keyboard/Config.cpp
View File

@ -27,9 +27,9 @@
#include <QProcess> #include <QProcess>
#include <QTimer> #include <QTimer>
#include <QtDBus/QDBusConnection> #include <QDBusConnection>
#include <QtDBus/QDBusInterface> #include <QDBusInterface>
#include <QtDBus/QDBusReply> #include <QDBusReply>
/* Returns stringlist with suitable setxkbmap command-line arguments /* Returns stringlist with suitable setxkbmap command-line arguments
* to set the given @p model. * to set the given @p model.