OSDN Git Service

khotkeys: try qdbusviewer-qt4 before qdbusviewer
authorIvailo Monev <xakepa10@gmail.com>
Sat, 30 Apr 2016 15:29:03 +0000 (15:29 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Sat, 30 Apr 2016 15:29:03 +0000 (15:29 +0000)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp

index 5c72762..8a7d021 100644 (file)
@@ -20,6 +20,7 @@
 
 #include <KMessageBox>
 #include <KRun>
+#include <KStandardDirs>
 
 DbusActionWidget::DbusActionWidget(
     KHotKeys::DBusAction *action,
@@ -117,7 +118,12 @@ bool DbusActionWidget::isChanged() const
 
 void DbusActionWidget::launchDbusBrowser() const
     {
-    if( KRun::runCommand( "qdbusviewer", window()) == 0 )
+    QString qdbusviewerExe = KStandardDirs::findExe("qdbusviewer-qt4");
+    if (qdbusviewerExe.isEmpty()) {
+        // no exe lookup, let it fail if not found
+        qdbusviewerExe = "qdbusviewer";
+    }
+    if( KRun::runCommand( qdbusviewerExe, window()) == 0 )
         {
         KMessageBox::sorry( window(), i18n( "Failed to run qdbusviewer" ));
         }