diff --git a/runners/calculator/CMakeLists.txt b/runners/calculator/CMakeLists.txt index b1ab6e6a1..652a28a55 100644 --- a/runners/calculator/CMakeLists.txt +++ b/runners/calculator/CMakeLists.txt @@ -33,7 +33,6 @@ if ( QALCULATE_FOUND ) KF5::Runner KF5::I18n Qt5::Network - Qt5::Script Qt5::Widgets ) else () @@ -42,7 +41,7 @@ else () KF5::Runner KF5::I18n Qt5::Gui - Qt5::Script + Qt5::Qml ) endif () diff --git a/runners/calculator/calculatorrunner.cpp b/runners/calculator/calculatorrunner.cpp index 68e48ca88..cba549866 100644 --- a/runners/calculator/calculatorrunner.cpp +++ b/runners/calculator/calculatorrunner.cpp @@ -24,7 +24,7 @@ #ifdef ENABLE_QALCULATE #include "qalculate_engine.h" #else -#include +#include #include #include #endif @@ -292,8 +292,8 @@ QString CalculatorRunner::calculate(const QString& term) return result.replace('.', QLocale().decimalPoint(), Qt::CaseInsensitive); #else //qDebug() << "calculating" << term; - QScriptEngine eng; - QScriptValue result = eng.evaluate(" var result ="+term+"; result"); + QJSEngine eng; + QJSValue result = eng.evaluate(QStringLiteral("var result = %1; result").arg(term)); if (result.isError()) { return QString();