summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/libs/installer/scriptengine.cpp2
-rw-r--r--tests/auto/installer/scriptengine/data/auto-install.qs2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/installer/scriptengine.cpp b/src/libs/installer/scriptengine.cpp
index 630829725..4d062c9cb 100644
--- a/src/libs/installer/scriptengine.cpp
+++ b/src/libs/installer/scriptengine.cpp
@@ -511,7 +511,7 @@ QJSValue ScriptEngine::loadInContext(const QString &context, const QString &file
// replacements of %1, %2 or %3 inside the javascript code.
const QString scriptContent = QLatin1String("(function() {")
+ scriptInjection + QString::fromUtf8(file.readAll())
- + QString::fromLatin1(";"
+ + QString::fromLatin1("\n"
" if (typeof %1 != \"undefined\")"
" return new %1;"
" else"
diff --git a/tests/auto/installer/scriptengine/data/auto-install.qs b/tests/auto/installer/scriptengine/data/auto-install.qs
index 6decd31dc..4b0d28b14 100644
--- a/tests/auto/installer/scriptengine/data/auto-install.qs
+++ b/tests/auto/installer/scriptengine/data/auto-install.qs
@@ -50,3 +50,5 @@ Controller.prototype.FinishedPageCallback = function()
{
print("FinishedPageCallback - OK")
}
+
+// Trailing comment to exercise QTIFW-1062 \ No newline at end of file