diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2023-04-20 15:45:30 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2023-05-10 11:30:15 +0300 |
| commit | 557a0f508f8288376eef01472c19b155d1eaffab (patch) | |
| tree | 0a76ce9daf81a088ed387cb522a790c124698f38 | |
| parent | 4bbb2ef5572e7076775e8c902e7fb43db2b0c2bc (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>
| -rw-r--r-- | src/libs/installer/globals.cpp | 4 | ||||
| -rw-r--r-- | src/libs/installer/scriptengine.cpp | 13 | ||||
| -rw-r--r-- | src/libs/installer/scriptengine_p.h | 13 |
3 files changed, 6 insertions, 24 deletions
diff --git a/src/libs/installer/globals.cpp b/src/libs/installer/globals.cpp index 5240138c4..b6bf0ca3e 100644 --- a/src/libs/installer/globals.cpp +++ b/src/libs/installer/globals.cpp @@ -78,7 +78,9 @@ QStringList loggingCategories() { static QStringList categories = QStringList() << QLatin1String(IFW_INSTALLER_INSTALLLOG) - << QLatin1String(IFW_SERVER); + << QLatin1String(IFW_SERVER) + << QLatin1String(IFW_DEVELOPER_BUILD) + << QLatin1String("js"); return categories; } 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()); diff --git a/src/libs/installer/scriptengine_p.h b/src/libs/installer/scriptengine_p.h index a0936fe75..0a8ddf5b1 100644 --- a/src/libs/installer/scriptengine_p.h +++ b/src/libs/installer/scriptengine_p.h @@ -43,18 +43,6 @@ class PackageManagerCore; class PackageManagerGui; class ScriptEngine; -class ConsoleProxy : public QObject -{ - Q_OBJECT - Q_DISABLE_COPY(ConsoleProxy) - -public: - ConsoleProxy() {} - -public slots : - void log(const QString &log) { qCDebug(QInstaller::lcInstallerInstallLog).noquote() << log; } -}; - class InstallerProxy : public QObject { Q_OBJECT @@ -178,7 +166,6 @@ private: } // namespace QInstaller -Q_DECLARE_METATYPE(QInstaller::ConsoleProxy*) Q_DECLARE_METATYPE(QInstaller::InstallerProxy*) Q_DECLARE_METATYPE(QInstaller::QFileDialogProxy*) Q_DECLARE_METATYPE(QInstaller::QDesktopServicesProxy*) |