summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/scriptengine.cpp
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2023-04-20 15:45:30 +0300
committerKatja Marttila <katja.marttila@qt.io>2023-05-10 11:30:15 +0300
commit557a0f508f8288376eef01472c19b155d1eaffab (patch)
tree0a76ce9daf81a088ed387cb522a790c124698f38 /src/libs/installer/scriptengine.cpp
parent4bbb2ef5572e7076775e8c902e7fb43db2b0c2bc (diff)
Remove unnecessary ConsoleProxy
From 5.x onwards javascript has had ConsoleExtension, no need to create own custom console.log and print functions. Task-number: QTIFW-1829 Change-Id: I892106824e0aa7139f4b2f75df7011525625c27d Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src/libs/installer/scriptengine.cpp')
-rw-r--r--src/libs/installer/scriptengine.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/libs/installer/scriptengine.cpp b/src/libs/installer/scriptengine.cpp
index baf348868..4bce74991 100644
--- a/src/libs/installer/scriptengine.cpp
+++ b/src/libs/installer/scriptengine.cpp
@@ -56,12 +56,6 @@ namespace QInstaller {
/*!
\inmodule QtInstallerFramework
- \class QInstaller::ConsoleProxy
- \internal
-*/
-
-/*!
- \inmodule QtInstallerFramework
\class QInstaller::InstallerProxy
\internal
*/
@@ -382,14 +376,13 @@ ScriptEngine::ScriptEngine(PackageManagerCore *core) : QObject(core)
, m_guiProxy(new GuiProxy(this, this))
, m_core(core)
{
- m_engine.installExtensions(QJSEngine::TranslationExtension);
+ m_engine.installExtensions(QJSEngine::TranslationExtension | QJSEngine::ConsoleExtension);
QJSValue global = m_engine.globalObject();
- global.setProperty(QLatin1String("console"), m_engine.newQObject(new ConsoleProxy));
+
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("print"), m_engine.newQObject(new ConsoleProxy)
- .property(QLatin1String("log")));
+
global.setProperty(QLatin1String("systemInfo"), m_engine.newQObject(new SystemInfo));
global.setProperty(QLatin1String("QInstaller"), generateQInstallerObject());