diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ include(ECMInstallIcons) include(ECMMarkAsTest) -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Gui Widgets Script Test) +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Gui Widgets Qml Test) find_package(Boost REQUIRED) macro(assert_min_ver version) set(error_msg "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_VERSION} not supported") diff --git a/src/scripting/CMakeLists.txt b/src/scripting/CMakeLists.txt --- a/src/scripting/CMakeLists.txt +++ b/src/scripting/CMakeLists.txt @@ -6,6 +6,6 @@ add_library(scripting STATIC ${scripting_SRCS}) target_link_libraries(scripting Qt5::Core - Qt5::Script + Qt5::Qml ) diff --git a/src/scripting/scripthandler.h b/src/scripting/scripthandler.h --- a/src/scripting/scripthandler.h +++ b/src/scripting/scripthandler.h @@ -26,7 +26,7 @@ #define SCRIPTING_SCRIPTHANDLER_H #include -#include +#include #include "domain/taskrepository.h" @@ -39,15 +39,15 @@ public: explicit ScriptHandler(const Domain::TaskRepository::Ptr &taskRepository, QObject *parent = Q_NULLPTR); - QScriptValue evaluateFile(const QString &filename); - QScriptValue evaluateString(const QString &string); + QJSValue evaluateFile(const QString &filename); + QJSValue evaluateString(const QString &string); - QScriptEngine *engine(); + QJSEngine *engine(); private: Domain::TaskRepository::Ptr m_taskRepository; - QScriptEngine *m_engine; + QJSEngine *m_engine; }; } diff --git a/src/scripting/scripthandler.cpp b/src/scripting/scripthandler.cpp --- a/src/scripting/scripthandler.cpp +++ b/src/scripting/scripthandler.cpp @@ -26,20 +26,20 @@ #include "taskaction.h" #include -#include +#include using namespace Scripting; ScriptHandler::ScriptHandler(const Domain::TaskRepository::Ptr &taskRepository, QObject *parent) : QObject(parent), m_taskRepository(taskRepository), - m_engine(new QScriptEngine(this)) + m_engine(new QJSEngine(this)) { m_engine->globalObject().setProperty(QStringLiteral("task"), m_engine->newQObject(new TaskAction(m_taskRepository, this))); } -QScriptValue ScriptHandler::evaluateFile(const QString &filename) +QJSValue ScriptHandler::evaluateFile(const QString &filename) { QFile file(filename); file.open(QIODevice::ReadOnly); @@ -49,12 +49,12 @@ return m_engine->evaluate(filecontent, filename); } -QScriptValue ScriptHandler::evaluateString(const QString &string) +QJSValue ScriptHandler::evaluateString(const QString &string) { return m_engine->evaluate(string); } -QScriptEngine *ScriptHandler::engine() +QJSEngine *ScriptHandler::engine() { return m_engine; } diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -23,7 +23,7 @@ add_library(widgets STATIC ${widgets_SRCS}) target_link_libraries(widgets - Qt5::Script + Qt5::Qml Qt5::Widgets presentation zanshinkdepimstatic diff --git a/tests/features/zanshin/features/step_definitions/CMakeLists.txt b/tests/features/zanshin/features/step_definitions/CMakeLists.txt --- a/tests/features/zanshin/features/step_definitions/CMakeLists.txt +++ b/tests/features/zanshin/features/step_definitions/CMakeLists.txt @@ -17,7 +17,7 @@ ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} Qt5::Test - Qt5::Script + Qt5::Qml testlib akonadi domain diff --git a/tests/units/scripting/scripthandlertest.cpp b/tests/units/scripting/scripthandlertest.cpp --- a/tests/units/scripting/scripthandlertest.cpp +++ b/tests/units/scripting/scripthandlertest.cpp @@ -23,7 +23,7 @@ #include -#include +#include #include "scripting/scripthandler.h" @@ -55,11 +55,11 @@ auto expression = QStringLiteral("41+1"); // WHEN - QScriptValue result = scripthandler->evaluateString(expression); + QJSValue result = scripthandler->evaluateString(expression); // THEN QVERIFY(result.isNumber()); - QCOMPARE(result.toInt32(), 42); + QCOMPARE(result.toInt(), 42); } void shouldEvaluateFile() @@ -77,11 +77,11 @@ scriptfile.close(); // WHEN - QScriptValue result = scripthandler->evaluateFile(scriptfile.fileName()); + QJSValue result = scripthandler->evaluateFile(scriptfile.fileName()); // THEN QVERIFY(result.isNumber()); - QCOMPARE(result.toInt32(), 42); + QCOMPARE(result.toInt(), 42); } };