diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(QT_MIN_VERSION "5.9.0") set(KF5_MIN_VERSION "5.45.0") set(INSTALL_SDDM_THEME TRUE) -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Test Script Network) +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Test Network) find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt --- a/shell/CMakeLists.txt +++ b/shell/CMakeLists.txt @@ -58,7 +58,6 @@ KF5::Crash KF5::Plasma KF5::PlasmaQuick - Qt5::Script KF5::Solid KF5::Declarative KF5::I18n diff --git a/shell/scripting/containment.h b/shell/scripting/containment.h --- a/shell/scripting/containment.h +++ b/shell/scripting/containment.h @@ -20,7 +20,6 @@ #ifndef CONTAINMENT #define CONTAINMENT -#include #include #include diff --git a/shell/scripting/panel.h b/shell/scripting/panel.h --- a/shell/scripting/panel.h +++ b/shell/scripting/panel.h @@ -20,7 +20,6 @@ #ifndef PANEL #define PANEL -#include #include #include diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp --- a/shell/shellcorona.cpp +++ b/shell/shellcorona.cpp @@ -1357,8 +1357,8 @@ return; } - scriptEngine.globalObject().setProperty(QStringLiteral("applet"), scriptEngine.newQObject(applet)); - scriptEngine.globalObject().setProperty(QStringLiteral("containment"), scriptEngine.newQObject(containment)); + scriptEngine.globalObject().setProperty(QStringLiteral("applet"), scriptEngine.wrap(applet)); + scriptEngine.globalObject().setProperty(QStringLiteral("containment"), scriptEngine.wrap(containment)); scriptEngine.evaluateScript(script, scriptFile); }