aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vrátil <[email protected]>2017-09-15 12:12:53 +0200
committerDaniel Vrátil <[email protected]>2017-09-15 12:12:53 +0200
commit6669383d48baff4f8fa79abd90cedf7de39ba336 (patch)
tree93391c43213152ff6d9daed2316ea488116cfe96
parent35204de0f3ab135fc7fde6cc6850102e3ac044e1 (diff)
Look for xapian-delve executable, fallback to delve
-rw-r--r--debug/job/akonadisearchdebugsearchjob.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/debug/job/akonadisearchdebugsearchjob.cpp b/debug/job/akonadisearchdebugsearchjob.cpp
index 99fd3fc..7a36209 100644
--- a/debug/job/akonadisearchdebugsearchjob.cpp
+++ b/debug/job/akonadisearchdebugsearchjob.cpp
@@ -35,7 +35,12 @@ AkonadiSearchDebugSearchJob::~AkonadiSearchDebugSearchJob()
void AkonadiSearchDebugSearchJob::start()
{
- const QString delvePath = QStandardPaths::findExecutable(QStringLiteral("delve"));
+ // "delve" is also a name of Go debugger, some distros prefer xapian-delve
+ // for that reason, so try that first and fallback to "delve"
+ QString delvePath = QStandardPaths::findExecutable(QStringLiteral("xapian-delve"));
+ if (delvePath.isEmpty()) {
+ delvePath = QStandardPaths::findExecutable(QStringLiteral("delve"));
+ }
if (delvePath.isEmpty()) {
//Don't translate it. Just debug
Q_EMIT error(QStringLiteral("\"delve\" not installed on computer."));