diff options
Diffstat (limited to 'src/libs/installer/scriptengine.cpp')
-rw-r--r-- | src/libs/installer/scriptengine.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/libs/installer/scriptengine.cpp b/src/libs/installer/scriptengine.cpp index 0560e7e90..adf841bde 100644 --- a/src/libs/installer/scriptengine.cpp +++ b/src/libs/installer/scriptengine.cpp @@ -203,6 +203,15 @@ QList<QJSValue> GuiProxy::findChildren(QObject *parent, const QString &objectNam return children; } +/*! + Hides the GUI when \a silent is \c true. +*/ +void GuiProxy::setSilent(bool silent) +{ + if (m_gui) + m_gui->setSilent(silent); +} + void GuiProxy::cancelButtonClicked() { if (m_gui) @@ -265,7 +274,7 @@ ScriptEngine::ScriptEngine(PackageManagerCore *core) : setGuiQObject(core->guiObject()); QQmlEngine::setObjectOwnership(core, QQmlEngine::CppOwnership); global.setProperty(QLatin1String("installer"), m_engine.newQObject(core)); - connect(core, SIGNAL(guiObjectChanged(QObject*)), this, SLOT(setGuiQObject(QObject*))); + connect(core, &PackageManagerCore::guiObjectChanged, this, &ScriptEngine::setGuiQObject); } else { global.setProperty(QLatin1String("installer"), m_engine.newQObject(new QObject)); } @@ -371,7 +380,7 @@ QJSValue ScriptEngine::loadInContext(const QString &context, const QString &file { QFile file(fileName); if (!file.open(QIODevice::ReadOnly)) { - throw Error(tr("Could not open the requested script file at %1: %2.") + throw Error(tr("Cannot open script file at %1: %2") .arg(fileName, file.errorString())); } @@ -389,9 +398,10 @@ QJSValue ScriptEngine::loadInContext(const QString &context, const QString &file QJSValue scriptContext = evaluate(scriptContent, fileName); scriptContext.setProperty(QLatin1String("Uuid"), QUuid::createUuid().toString()); if (scriptContext.isError()) { - throw Error(tr("Exception while loading the component script '%1'. (%2)").arg( - QFileInfo(file).absoluteFilePath(), scriptContext.toString().isEmpty() ? - QString::fromLatin1("Unknown error.") : scriptContext.toString())); + throw Error(tr("Exception while loading the component script \"%1\": %2").arg( + QDir::toNativeSeparators(QFileInfo(file).absoluteFilePath()), + scriptContext.toString().isEmpty() ? + tr("Unknown error.") : scriptContext.toString())); } return scriptContext; } |