diff options
| author | Martin Kampas <martin.kampas@jolla.com> | 2018-08-29 09:56:23 +0200 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2020-11-04 12:13:38 +0200 |
| commit | 8c2261f804c4f5f5934024cf9b548e3a31c9878f (patch) | |
| tree | 89f0e33ef43f3af15fe02611fed860d6e795ac41 | |
| parent | 8f86b47e717819d1df858e14b62f1ff36616acc0 (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>
| -rw-r--r-- | src/libs/installer/scriptengine.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/installer/scriptengine/data/auto-install.qs | 2 |
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 |