Merge remote-tracking branch 'origin/4.1'

Change-Id: Iff5a7a99afca53305c7f404a74f210f67728dd54

1 files changed, 7 insertions, 0 deletions

diff --git a/src/sdk/commandlineinterface.cpp b/src/sdk/commandlineinterface.cpp
index a6cd22151..59e9afe90 100644
--- a/src/sdk/commandlineinterface.cpp
+++ b/src/sdk/commandlineinterface.cpp
@@ -78,6 +78,13 @@ bool CommandLineInterface::initialize()
         // quite safe to assume that command is the first positional argument.
         m_positionalArguments.removeFirst();
     }
+
+    QString ctrlScript = controlScript();
+    if (!ctrlScript.isEmpty()) {
+        m_core->controlScriptEngine()->loadInContext(
+                QLatin1String("Controller"), ctrlScript);
+        qCDebug(QInstaller::lcInstallerInstallLog) << "Loaded control script" << ctrlScript;
+    }
     return true;
 }