5 files changed, 25 insertions, 57 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index 9c8bd9f89..d733706dd 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -64,6 +64,11 @@
 #include <private/qv4object_p.h>
 
 #include <algorithm>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#include <QJSEngine>
+#else
+#include <QQmlEngine>
+#endif
 
 using namespace QInstaller;
 
@@ -247,6 +252,11 @@ Component::Component(PackageManagerCore *core)
     : d(new ComponentPrivate(core, this))
     , m_defaultArchivePath(scTargetDirPlaceholder)
 {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+    QJSEngine::setObjectOwnership(this, QJSEngine::CppOwnership);
+#else
+    QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
+#endif
     setPrivate(d);
 
     connect(this, &Component::valueChanged, this, &Component::updateModelData);
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 35fd28337..ef27f6b53 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -2138,6 +2138,18 @@ Component *PackageManagerCore::componentByName(const QString &name, const QList<
 }
 
 /*!
+    Returns an array of all components currently available. If the repository
+    metadata have not been fetched yet, the array will be empty. Optionally, a
+    \a regexp expression can be used to further filter the listed packages.
+
+    \sa {installer::components}{installer.components}
+ */
+QList<Component *> PackageManagerCore::components(const QString &regexp) const
+{
+    return components(PackageManagerCore::ComponentType::All, regexp);
+}
+
+/*!
     Returns \c true if directory specified by \a path is writable by
     the current user.
 */
diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h
index 0c167f92c..f85e5fcae 100644
--- a/src/libs/installer/packagemanagercore.h
+++ b/src/libs/installer/packagemanagercore.h
@@ -241,7 +241,8 @@ public:
     void appendUpdaterComponent(Component *components);
 
     QList<Component *> components(ComponentTypes mask, const QString &regexp = QString()) const;
-    Component *componentByName(const QString &identifier) const;
+    Q_INVOKABLE QInstaller::Component *componentByName(const QString &identifier) const;
+    Q_INVOKABLE QList<QInstaller::Component *> components(const QString &regexp = QString()) const;
 
     Q_INVOKABLE bool calculateComponentsToInstall() const;
     QList<Component*> orderedComponentsToInstall() const;
diff --git a/src/libs/installer/scriptengine.cpp b/src/libs/installer/scriptengine.cpp
index 4bce74991..602f88b61 100644
--- a/src/libs/installer/scriptengine.cpp
+++ b/src/libs/installer/scriptengine.cpp
@@ -56,12 +56,6 @@ namespace QInstaller {
 
 /*!
     \inmodule QtInstallerFramework
-    \class QInstaller::InstallerProxy
-    \internal
-*/
-
-/*!
-    \inmodule QtInstallerFramework
     \class QInstaller::QDesktopServicesProxy
     \internal
 */
@@ -72,28 +66,6 @@ namespace QInstaller {
     \internal
 */
 
-QJSValue InstallerProxy::components(const QString &regexp) const
-{
-    if (m_core) {
-        const QList<Component*> all = m_core->components(PackageManagerCore::ComponentType::All, regexp);
-        QJSValue scriptComponentsObject = m_engine->newArray(all.count());
-        for (int i = 0; i < all.count(); ++i) {
-            Component *const component = all.at(i);
-            QQmlEngine::setObjectOwnership(component, QQmlEngine::CppOwnership);
-            scriptComponentsObject.setProperty(i, m_engine->newQObject(component));
-        }
-        return scriptComponentsObject;
-    }
-    return m_engine->newArray();
-}
-
-QJSValue InstallerProxy::componentByName(const QString &componentName)
-{
-    if (m_core)
-        return m_engine->newQObject(m_core->componentByName(componentName), false);
-    return QJSValue();
-}
-
 QJSValue QDesktopServicesProxy::findFiles(const QString &path, const QString &pattern)
 {
     QStringList result;
@@ -380,9 +352,6 @@ ScriptEngine::ScriptEngine(PackageManagerCore *core) : QObject(core)
     QJSValue global = m_engine.globalObject();
 
     global.setProperty(QLatin1String("QFileDialog"), m_engine.newQObject(new QFileDialogProxy(core)));
-    const QJSValue proxy = m_engine.newQObject(new InstallerProxy(this, core));
-    global.setProperty(QLatin1String("InstallerProxy"), proxy);
-
     global.setProperty(QLatin1String("systemInfo"), m_engine.newQObject(new SystemInfo));
 
     global.setProperty(QLatin1String("QInstaller"), generateQInstallerObject());
@@ -402,11 +371,6 @@ ScriptEngine::ScriptEngine(PackageManagerCore *core) : QObject(core)
         global.setProperty(QLatin1String("installer"), m_engine.newQObject(new QObject));
     }
     global.setProperty(QLatin1String("gui"), m_engine.newQObject(m_guiProxy));
-
-    global.property(QLatin1String("installer")).setProperty(QLatin1String("components"),
-        proxy.property(QLatin1String("components")));
-    global.property(QLatin1String("installer")).setProperty(QLatin1String("componentByName"),
-        proxy.property(QLatin1String("componentByName")));
 }
 
 /*!
diff --git a/src/libs/installer/scriptengine_p.h b/src/libs/installer/scriptengine_p.h
index 0a8ddf5b1..035b68be4 100644
--- a/src/libs/installer/scriptengine_p.h
+++ b/src/libs/installer/scriptengine_p.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2022 The Qt Company Ltd.
+** Copyright (C) 2023 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -43,24 +43,6 @@ class PackageManagerCore;
 class PackageManagerGui;
 class ScriptEngine;
 
-class InstallerProxy : public QObject
-{
-    Q_OBJECT
-    Q_DISABLE_COPY(InstallerProxy)
-
-public:
-    InstallerProxy(ScriptEngine *engine, PackageManagerCore *core)
-        : m_engine(engine), m_core(core) {}
-
-public slots:
-    QJSValue components(const QString &regexp = QString()) const;
-    QJSValue componentByName(const QString &componentName);
-
-private:
-    ScriptEngine *m_engine;
-    PackageManagerCore *m_core;
-};
-
 class QFileDialogProxy : public QObject
 {
     Q_OBJECT
@@ -166,7 +148,6 @@ private:
 
 } // namespace QInstaller
 
-Q_DECLARE_METATYPE(QInstaller::InstallerProxy*)
 Q_DECLARE_METATYPE(QInstaller::QFileDialogProxy*)
 Q_DECLARE_METATYPE(QInstaller::QDesktopServicesProxy*)