diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2018-01-23 13:22:38 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2018-01-24 07:13:18 +0000 |
| commit | 9d00a5a957722167e55abfe7f329ea40ab31e4df (patch) | |
| tree | 8c7960e61568b0eecc4cfb9a2feebffcdfef049a | |
| parent | 5845091bd465451b9499d9d2fe68f56e4c12ba84 (diff) | |
Add line number information when throwing an Error regarding the script
Change-Id: I5bc3ca4779ed12d927c3a6a041a81d8e39d5bd1f
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| -rw-r--r-- | src/libs/installer/scriptengine.cpp | 5 | ||||
| -rw-r--r-- | tools/common/repositorygen.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/libs/installer/scriptengine.cpp b/src/libs/installer/scriptengine.cpp index 59f71a52c..28f91a394 100644 --- a/src/libs/installer/scriptengine.cpp +++ b/src/libs/installer/scriptengine.cpp @@ -401,8 +401,9 @@ QJSValue ScriptEngine::loadInContext(const QString &context, const QString &file if (scriptContext.isError()) { 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())); + scriptContext.toString().isEmpty() ? tr("Unknown error.") : scriptContext.toString() + + QStringLiteral(" ") + tr("on line number: ") + + scriptContext.property(QStringLiteral("lineNumber")).toString())); } return scriptContext; } diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp index 4c7dba3b4..e4eb33590 100644 --- a/tools/common/repositorygen.cpp +++ b/tools/common/repositorygen.cpp @@ -306,8 +306,9 @@ void QInstallerTools::copyMetaData(const QString &_targetDir, const QString &met if (value.isError()) { throw QInstaller::Error(QString::fromLatin1("Exception while loading component " "script at \"%1\": %2").arg(QDir::toNativeSeparators(scriptFile.fileName()), - value.toString().isEmpty() ? - QString::fromLatin1("Unknown error.") : value.toString())); + value.toString().isEmpty() ? QString::fromLatin1("Unknown error.") : + value.toString() + QStringLiteral(" on line number: ") + + value.property(QStringLiteral("lineNumber")).toString())); } const QString toLocation(QString::fromLatin1("%1/%2/%3").arg(targetDir, info.name, script)); |