diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2018-01-30 09:28:23 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2018-02-08 12:55:47 +0200 |
| commit | fff2c98f4a7d8e4e903232b08f72aeffd5e0cda1 (patch) | |
| tree | 901763a343a2085b6c21c314f1b789290ceaeb63 /tools | |
| parent | 0797935d299d0da007cae0ab89ee9ceadc41d670 (diff) | |
| parent | e6c28c7fe32de1dca539c987e1c0a26f48ab0483 (diff) | |
Merge remote-tracking branch 'origin/3.0' into master
Change-Id: I8d0c8b9faa9537b50e989ec264ed7bfe8d2e358b
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/common/repositorygen.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp index 295dea4d0..a1144a005 100644 --- a/tools/common/repositorygen.cpp +++ b/tools/common/repositorygen.cpp @@ -312,9 +312,10 @@ void QInstallerTools::copyMetaData(const QString &_targetDir, const QString &met const QJSValue value = testScriptEngine.evaluate(scriptContent, scriptFile.fileName()); 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())); + "script at \"%1\": %2").arg(QDir::toNativeSeparators(scriptFile.fileName()), + 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)); |