Commit 5a028a7c authored by Fabian Vogt's avatar Fabian Vogt
Browse files

Find qdbus command correctly

qdbus is installed into Qt's own binaries dir and might not be in $PATH.


(cherry picked from commit 0f19cb42)
parent a320a93c
Pipeline #233903 passed with stage
in 2 minutes and 29 seconds
......@@ -20,6 +20,7 @@ include(KDEClangFormat)
include(ECMFindQmlModule)
include(KDEGitCommitHooks)
include(ECMSetupQtPluginMacroNames)
include(ECMQueryQt)
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets)
......@@ -55,6 +56,8 @@ add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
add_definitions(-DQT_USE_QSTRINGBUILDER)
ecm_query_qt(QtBinariesDir QT_INSTALL_BINS)
add_subdirectory( Categories )
add_subdirectory( kcontrol/menus )
add_subdirectory( Modules )
......
......@@ -9,4 +9,6 @@ target_link_libraries(kcm_kwinsupportinfo KF5::CoreAddons KF5::QuickAddons KF5::
install(TARGETS kcm_kwinsupportinfo DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/kcms/kinfocenter)
configure_file(kcm_kwinsupportinfo.json.in ${CMAKE_CURRENT_BINARY_DIR}/kcm_kwinsupportinfo.json @ONLY)
kpackage_install_package(package kcm_kwinsupportinfo kcms)
......@@ -35,6 +35,6 @@
"Name[uk]": "Керування вікнами",
"Name[x-test]": "xxWindow Managerxx"
},
"TryExec": "qdbus",
"TryExec": "@QtBinariesDir@/qdbus",
"X-KDE-KInfoCenter-Category": "graphical_information"
}
......@@ -8,6 +8,7 @@
#include <KLocalizedString>
#include <KPluginFactory>
#include <KQuickAddons/ConfigModule>
#include <QLibraryInfo>
#include <CommandOutputContext.h>
......@@ -18,7 +19,7 @@ public:
explicit KCMKWinSupportInfo(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
: ConfigModule(parent, data, args)
{
auto outputContext = new CommandOutputContext(QStringLiteral("qdbus"),
auto outputContext = new CommandOutputContext(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"),
{QStringLiteral("org.kde.KWin"), QStringLiteral("/KWin"), QStringLiteral("supportInformation")},
parent);
qmlRegisterSingletonInstance("org.kde.kinfocenter.kwinsupportinfo.private", 1, 0, "InfoOutputContext", outputContext);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment