From 8c2261f804c4f5f5934024cf9b548e3a31c9878f Mon Sep 17 00:00:00 2001 From: Martin Kampas Date: Wed, 29 Aug 2018 09:56:23 +0200 Subject: Fix loading controller script with comment on last line Task-number: QTIFW-1062 Change-Id: I3deb46cae74d1e5851d4ddd4b58c0ba19375ddbd Reviewed-by: Arttu Tarkiainen Reviewed-by: Katja Marttila --- src/libs/installer/scriptengine.cpp | 2 +- tests/auto/installer/scriptengine/data/auto-install.qs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3