summaryrefslogtreecommitdiffstats
path: root/src/libs
diff options
context:
space:
mode:
authorMartin Kampas <martin.kampas@jolla.com>2018-08-29 09:56:23 +0200
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2020-11-04 12:13:38 +0200
commit8c2261f804c4f5f5934024cf9b548e3a31c9878f (patch)
tree89f0e33ef43f3af15fe02611fed860d6e795ac41 /src/libs
parent8f86b47e717819d1df858e14b62f1ff36616acc0 (diff)
Fix loading controller script with comment on last line
Task-number: QTIFW-1062 Change-Id: I3deb46cae74d1e5851d4ddd4b58c0ba19375ddbd Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/installer/scriptengine.cpp2
1 files changed, 1 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"