diff --git a/runners/calculator/CMakeLists.txt b/runners/calculator/CMakeLists.txt --- a/runners/calculator/CMakeLists.txt +++ b/runners/calculator/CMakeLists.txt @@ -33,16 +33,15 @@ KF5::Runner KF5::I18n Qt5::Network - Qt5::Script Qt5::Widgets ) else () add_library(krunner_calculatorrunner MODULE ${krunner_calculatorrunner_SRCS}) target_link_libraries(krunner_calculatorrunner KF5::Runner KF5::I18n Qt5::Gui - Qt5::Script + Qt5::Qml ) endif () diff --git a/runners/calculator/calculatorrunner.cpp b/runners/calculator/calculatorrunner.cpp --- 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 @@ 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();