Merge branch 'Plasma/5.4'

8 files changed, 18 insertions, 23 deletions

diff --git a/README.PACKAGERS b/README.PACKAGERS
index 28f1519..8c66ab8 100644
--- a/README.PACKAGERS
+++ b/README.PACKAGERS
@@ -1,11 +1,10 @@
 Runtime dependencies:
-libmuonprivate:
-- kdesudo
-- software-properties-kde
-
 muon:
 - apt-xapian-index
 
-muon-discover:
+apt-backend:
 - app-install-data
 - apt-xapian-index
+- kde-cli-tools (kdesu)
+- software-properties-kde
+
diff --git a/discover/qml/ApplicationDetails.qml b/discover/qml/ApplicationDetails.qml
index 4907db9..6abe972 100644
--- a/discover/qml/ApplicationDetails.qml
+++ b/discover/qml/ApplicationDetails.qml
@@ -29,10 +29,10 @@ ColumnLayout
     property alias isInstalling: installButton.isActive
     property alias application: installButton.application
     spacing: 10
+
     InstallApplicationButton {
         id: installButton
         anchors.horizontalCenter: parent.horizontalCenter
-
         additionalItem:  Rating {
             property QtObject ratingInstance: application.rating
             visible: ratingInstance!=null
diff --git a/discover/qml/MuonToolbar.qml b/discover/qml/MuonToolbar.qml
index 1a59235..7fbeef7 100644
--- a/discover/qml/MuonToolbar.qml
+++ b/discover/qml/MuonToolbar.qml
@@ -107,7 +107,7 @@ ToolBar
         }
         ToolButton {
             id: button
-            iconName: "preferences-other"
+            iconName: "application-menu"
             tooltip: i18n("Configure and learn about Muon Discover")
             onClicked: {
                 var pos = mapToItem(window, 0, height);
diff --git a/libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp b/libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp
index bb56c35..414509f 100644
--- a/libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp
+++ b/libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp
@@ -103,10 +103,8 @@ void ApplicationNotifier::checkUpgradeFinished(int exitStatus)
 
 void ApplicationNotifier::upgradeActivated()
 {
-    QString pkexec = QStandardPaths::findExecutable("pkexec");
-    QString upgrader = QStringLiteral("do-release-upgrade -m desktop -f DistUpgradeViewKDE");
-    
-    QProcess::startDetached(pkexec, QStringList() << upgrader);
+    const QString kdesu = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesu");
+    QProcess::startDetached(kdesu, { "--", "do-release-upgrade", "-m", "desktop", "-f", "DistUpgradeViewKDE" });
 }
 
 void ApplicationNotifier::recheckSystemUpdateNeeded()
diff --git a/libmuon/backends/ApplicationBackend/CMakeLists.txt b/libmuon/backends/ApplicationBackend/CMakeLists.txt
index 4785e1f..b90ee44 100644
--- a/libmuon/backends/ApplicationBackend/CMakeLists.txt
+++ b/libmuon/backends/ApplicationBackend/CMakeLists.txt
@@ -34,6 +34,7 @@ install(FILES distupgradeevent/releasechecker DESTINATION ${DATA_INSTALL_DIR}/li
 )
 
 add_library(MuonApplicationNotifier MODULE ApplicationNotifier.cpp)
+target_compile_definitions(MuonApplicationNotifier PRIVATE -DCMAKE_INSTALL_FULL_LIBEXECDIR_KF5=\"${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}\")
 target_link_libraries(MuonApplicationNotifier KF5::CoreAddons KF5::I18n KF5::Notifications KF5::IconThemes MuonNotifiers)
 
 install(TARGETS MuonApplicationNotifier DESTINATION ${PLUGIN_INSTALL_DIR}/muon-notifier)
diff --git a/libmuonapt/CMakeLists.txt b/libmuonapt/CMakeLists.txt
index 1c8bae9..fe3928c 100644
--- a/libmuonapt/CMakeLists.txt
+++ b/libmuonapt/CMakeLists.txt
@@ -14,6 +14,8 @@ target_link_libraries(MuonApt Qt5::Core
      QApt::Main KF5::I18n
 )
 
+target_compile_definitions(MuonApt PRIVATE -DCMAKE_INSTALL_FULL_LIBEXECDIR_KF5=\"${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}\")
+
 target_include_directories(MuonApt PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_executable(muon_repo_helper AddRepositoryHelper.cpp)
diff --git a/libmuonapt/QAptActions.cpp b/libmuonapt/QAptActions.cpp
index a8cee2b..12d79cd 100644
--- a/libmuonapt/QAptActions.cpp
+++ b/libmuonapt/QAptActions.cpp
@@ -389,17 +389,14 @@ void QAptActions::runSourcesEditor()
     QStringList arguments;
     int winID = m_mainWindow->effectiveWinId();
 
-    QString pkexec = QStandardPaths::findExecutable("pkexec");
-    QString editor = QStandardPaths::findExecutable("software-properties-kde");
+    const QString kdesu = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesu");
+    const QString editor = QStandardPaths::findExecutable("software-properties-kde");
 
+    arguments << kdesu << "--" << editor << QStringLiteral("--attach") << QString::number(winID);
     if (m_reloadWhenEditorFinished) {
-        editor.append(QLatin1String(" --dont-update --attach ") % QString::number(winID)); //krazy:exclude=spelling;
-    } else {
-        editor.append(QLatin1String(" --attach ") % QString::number(winID));
+        arguments << QStringLiteral("--dont-update");
     }
 
-    arguments << pkexec << editor;
-
     proc->setProgram(arguments);
     m_mainWindow->find(winID)->setEnabled(false);
     proc->start();
@@ -506,10 +503,8 @@ void QAptActions::closeHistoryDialog()
 
 void QAptActions::launchDistUpgrade()
 {
-    QString pkexec = QStandardPaths::findExecutable("pkexec");
-    QString upgrader = QStringLiteral("do-release-upgrade -m desktop -f DistUpgradeViewKDE");
-
-    QProcess::startDetached(pkexec, QStringList() << upgrader);
+    const QString kdesu = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesu");
+    QProcess::startDetached(kdesu, {"--", "do-release-upgrade", "-m", "desktop", "-f", "DistUpgradeViewKDE"});
 }
 
 void QAptActions::checkDistUpgrade()
diff --git a/muon/MainWindow.cpp b/muon/MainWindow.cpp
index cda7661..2f77b91 100644
--- a/muon/MainWindow.cpp
+++ b/muon/MainWindow.cpp
@@ -420,7 +420,7 @@ void MainWindow::editSettings()
 {
     if (!m_settingsDialog) {
         m_settingsDialog = new ManagerSettingsDialog(this, m_backend->config());
-        connect(m_settingsDialog, SIGNAL(finished()), SLOT(closeSettingsDialog()));
+        connect(m_settingsDialog, SIGNAL(finished(int)), SLOT(closeSettingsDialog()));
         connect(m_settingsDialog, SIGNAL(settingsChanged()), SLOT(loadSettings()));
         m_settingsDialog->show();
     } else {