From 8e92d4df1f878b8024004f44eb9f1f367e635b31 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Thu, 18 Jan 2018 12:18:22 +0100 Subject: [PATCH] [Calculator Runner] Move action check outside of ifdef Otherwise would always trigger copy to clipboard action if qalculate wasn't available --- runners/calculator/calculatorrunner.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runners/calculator/calculatorrunner.cpp b/runners/calculator/calculatorrunner.cpp index b9e47e95e..1886229d1 100644 --- a/runners/calculator/calculatorrunner.cpp +++ b/runners/calculator/calculatorrunner.cpp @@ -327,13 +327,13 @@ QString CalculatorRunner::calculate(const QString& term, bool *isApproximate) void CalculatorRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match) { Q_UNUSED(context); -#ifdef ENABLE_QALCULATE if (match.selectedAction() == action(s_copyToClipboardId)) { +#ifdef ENABLE_QALCULATE m_engine->copyToClipboard(); - } #else - QGuiApplication::clipboard()->setText(match.text()); + QGuiApplication::clipboard()->setText(match.text()); #endif + } } QList CalculatorRunner::actionsForMatch(const Plasma::QueryMatch &match)