4 files changed, 6 insertions, 10 deletions
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index 6253f3e25..7eb816a1a 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -141,6 +141,9 @@ int InstallerBase::run()
         controlScript = parser.value(QLatin1String(CommandLineOptions::Script));
         if (!QFileInfo(controlScript).exists())
             throw QInstaller::Error(QLatin1String("Script file does not exist."));
+    } else if (!m_core->settings().controlScript().isEmpty()) {
+        controlScript = QLatin1String(":/metadata/installer-config/")
+            + m_core->settings().controlScript();
     }
 
     if (parser.isSet(QLatin1String(CommandLineOptions::Proxy))) {
diff --git a/src/sdk/installerbasecommons.cpp b/src/sdk/installerbasecommons.cpp
index efdd58b75..8b7953eda 100644
--- a/src/sdk/installerbasecommons.cpp
+++ b/src/sdk/installerbasecommons.cpp
@@ -64,10 +64,7 @@ InstallerGui::InstallerGui(PackageManagerCore *core)
     setPage(PackageManagerCore::ReadyForInstallation, new ReadyForInstallationPage(core));
     setPage(PackageManagerCore::PerformInstallation, new PerformInstallationPage(core));
     setPage(PackageManagerCore::InstallationFinished, new FinishedPage(core));
-}
 
-void InstallerGui::init()
-{
     foreach (const int id, pageIds()) {
         packageManagerCore()->controlScriptEngine()->addQObjectChildren(page(id));
         packageManagerCore()->componentScriptEngine()->addQObjectChildren(page(id));
@@ -104,10 +101,7 @@ MaintenanceGui::MaintenanceGui(PackageManagerCore *core)
 
     if (core->isUninstaller())
         wizardPageVisibilityChangeRequested(false, PackageManagerCore::InstallationFinished + 1);
-}
 
-void MaintenanceGui::init()
-{
     foreach (const int id, pageIds()) {
         packageManagerCore()->controlScriptEngine()->addQObjectChildren(page(id));
         packageManagerCore()->componentScriptEngine()->addQObjectChildren(page(id));
diff --git a/src/sdk/installerbasecommons.h b/src/sdk/installerbasecommons.h
index b3ba68c35..f6bde1fd0 100644
--- a/src/sdk/installerbasecommons.h
+++ b/src/sdk/installerbasecommons.h
@@ -46,7 +46,7 @@ class InstallerGui : public QInstaller::PackageManagerGui
 
 public:
     explicit InstallerGui(QInstaller::PackageManagerCore *core);
-    virtual void init();
+    ~InstallerGui() {}
 };
 
 
@@ -58,7 +58,7 @@ class MaintenanceGui : public QInstaller::PackageManagerGui
 
 public:
     explicit MaintenanceGui(QInstaller::PackageManagerCore *core);
-    virtual void init();
+    ~MaintenanceGui() {}
 
 private Q_SLOTS:
     void updateRestartPage();
diff --git a/src/sdk/tabcontroller.cpp b/src/sdk/tabcontroller.cpp
index 035622dfb..4cdb23d50 100644
--- a/src/sdk/tabcontroller.cpp
+++ b/src/sdk/tabcontroller.cpp
@@ -121,9 +121,8 @@ int TabController::init()
         d->m_init = true;
         // this should called as early as possible, to handle error message boxes for example
         if (!d->m_controlScript.isEmpty()) {
-            qDebug() << "Non-interactive installation using script:" << d->m_controlScript;
-
             d->m_gui->loadControlScript(d->m_controlScript);
+            qDebug() << "Using control script:" << d->m_controlScript;
         }
 
         connect(d->m_gui, SIGNAL(currentIdChanged(int)), this, SLOT(onCurrentIdChanged(int)));