Merge remote-tracking branch 'origin/3.0' into master

Change-Id: I73cb43e090c6ff34f1ceb774490d01818465e2e0

12 files changed, 21 insertions, 41 deletions

diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index 5d5028be1..872600f19 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -243,13 +243,11 @@ int InstallerBase::run()
         .isSet(QLatin1String(CommandLineOptions::CreateLocalRepository))
         || m_core->settings().createLocalRepository());
 
-    QHash<QString, QString> params;
     const QStringList positionalArguments = parser.positionalArguments();
     foreach (const QString &argument, positionalArguments) {
         if (argument.contains(QLatin1Char('='))) {
             const QString name = argument.section(QLatin1Char('='), 0, 0);
             const QString value = argument.section(QLatin1Char('='), 1, 1);
-            params.insert(name, value);
             m_core->setValue(name, value);
         }
     }
@@ -308,17 +306,11 @@ int InstallerBase::run()
         //create the wizard GUI
         TabController controller(0);
         controller.setManager(m_core);
-        controller.setManagerParams(params);
         controller.setControlScript(controlScript);
-        if (m_core->isInstaller()) {
+        if (m_core->isInstaller())
             controller.setGui(new InstallerGui(m_core));
-        }
-        else {
+        else
             controller.setGui(new MaintenanceGui(m_core));
-            //Start listening to setValue changes that newly installed components might have
-            connect(m_core, &QInstaller::PackageManagerCore::valueChanged, &controller,
-                &TabController::updateManagerParams);
-        }
 
         QInstaller::PackageManagerCore::Status status =
             QInstaller::PackageManagerCore::Status(controller.init());
diff --git a/src/sdk/tabcontroller.cpp b/src/sdk/tabcontroller.cpp
index 760e7dc38..dc4549d50 100644
--- a/src/sdk/tabcontroller.cpp
+++ b/src/sdk/tabcontroller.cpp
@@ -102,11 +102,6 @@ void TabController::setManager(QInstaller::PackageManagerCore *core)
     d->m_core = core;
 }
 
-void TabController::setManagerParams(const QHash<QString, QString> &params)
-{
-    d->m_params = params;
-}
-
 // -- public slots
 
 int TabController::init()
@@ -143,8 +138,8 @@ int TabController::init()
 
 void TabController::restartWizard()
 {
+    d->m_core->reset();
     if (d->m_networkSettingsChanged) {
-        d->m_core->reset(d->m_params);
         d->m_networkSettingsChanged = false;
 
         d->m_core->settings().setFtpProxy(d->m_settings.ftpProxy());
@@ -199,8 +194,3 @@ void TabController::onNetworkSettingsChanged(const QInstaller::Settings &setting
     d->m_settings = settings;
     d->m_networkSettingsChanged = true;
 }
-
-void TabController::updateManagerParams(const QString &key, const QString &value)
-{
-    d->m_params.insert(key, value);
-}
diff --git a/src/sdk/tabcontroller.h b/src/sdk/tabcontroller.h
index a314cb15b..5fc63aff3 100644
--- a/src/sdk/tabcontroller.h
+++ b/src/sdk/tabcontroller.h
@@ -51,13 +51,11 @@ public:
 
     void setGui(QInstaller::PackageManagerGui *gui);
     void setManager(QInstaller::PackageManagerCore *core);
-    void setManagerParams(const QHash<QString, QString> &params);
 
     void setControlScript(const QString &script);
 
 public Q_SLOTS:
     int init();
-    void updateManagerParams(const QString &key, const QString &value);
 
 private Q_SLOTS:
     void restartWizard();
diff --git a/src/sdk/translations/ifw_da.ts b/src/sdk/translations/ifw_da.ts
index b78bb380c..57540b788 100644
--- a/src/sdk/translations/ifw_da.ts
+++ b/src/sdk/translations/ifw_da.ts
@@ -1715,9 +1715,9 @@ Opdatering afbrudt!</translation>
     </message>
     <message>
         <source>
-Installing component %1</source>
+Installing component %1...</source>
         <translation>
-Installerer komponenten %1</translation>
+Installerer komponenten %1...</translation>
     </message>
     <message>
         <source>Installer Error</source>
diff --git a/src/sdk/translations/ifw_de.ts b/src/sdk/translations/ifw_de.ts
index 1b0fdf8d5..347b17cec 100644
--- a/src/sdk/translations/ifw_de.ts
+++ b/src/sdk/translations/ifw_de.ts
@@ -1739,9 +1739,9 @@ Aktualisierung abgebrochen!</translation>
     </message>
     <message>
         <source>
-Installing component %1</source>
+Installing component %1...</source>
         <translation>
-Komponente %1 wird installiert</translation>
+Komponente %1 wird installiert...</translation>
     </message>
     <message>
         <source>Installer Error</source>
diff --git a/src/sdk/translations/ifw_es.ts b/src/sdk/translations/ifw_es.ts
index 1ce64b86e..5ad785ade 100644
--- a/src/sdk/translations/ifw_es.ts
+++ b/src/sdk/translations/ifw_es.ts
@@ -1422,9 +1422,9 @@ Uninstallation aborted!</source>
     </message>
     <message>
         <source>
-Installing component %1</source>
+Installing component %1...</source>
         <translation>
-Instalando componente %1</translation>
+Instalando componente %1...</translation>
     </message>
     <message>
         <source>Installer Error</source>
diff --git a/src/sdk/translations/ifw_fr.ts b/src/sdk/translations/ifw_fr.ts
index 905f090cf..c79aa1308 100644
--- a/src/sdk/translations/ifw_fr.ts
+++ b/src/sdk/translations/ifw_fr.ts
@@ -1892,9 +1892,9 @@ Mise à jour annulée !</translation>
     </message>
     <message>
         <source>
-Installing component %1</source>
+Installing component %1...</source>
         <translation>
-Installation du composant %1</translation>
+Installation du composant %1...</translation>
     </message>
     <message>
         <source>Installer Error</source>
diff --git a/src/sdk/translations/ifw_it.ts b/src/sdk/translations/ifw_it.ts
index 514013f57..7deb5f548 100644
--- a/src/sdk/translations/ifw_it.ts
+++ b/src/sdk/translations/ifw_it.ts
@@ -1885,9 +1885,9 @@ Update aborted!</source>
     </message>
     <message>
         <source>
-Installing component %1</source>
+Installing component %1...</source>
         <translation>
-Installazione componenti %1</translation>
+Installazione componenti %1...</translation>
     </message>
     <message>
         <source>Installer Error</source>
diff --git a/src/sdk/translations/ifw_ja.ts b/src/sdk/translations/ifw_ja.ts
index 321e445c2..f8c04e97e 100644
--- a/src/sdk/translations/ifw_ja.ts
+++ b/src/sdk/translations/ifw_ja.ts
@@ -1902,9 +1902,9 @@ Update aborted!</source>
     </message>
     <message>
         <source>
-Installing component %1</source>
+Installing component %1...</source>
         <translation>
-コンポーネントのインストール中: %1</translation>
+コンポーネントのインストール中: %1...</translation>
     </message>
     <message>
         <source>Installer Error</source>
diff --git a/src/sdk/translations/ifw_pl.ts b/src/sdk/translations/ifw_pl.ts
index 98af6f62d..64cd6ac7f 100644
--- a/src/sdk/translations/ifw_pl.ts
+++ b/src/sdk/translations/ifw_pl.ts
@@ -1895,9 +1895,9 @@ Przerwano uaktualnianie.</translation>
     </message>
     <message>
         <source>
-Installing component %1</source>
+Installing component %1...</source>
         <translation>
-Instalacja komponentu %1</translation>
+Instalacja komponentu %1...</translation>
     </message>
     <message>
         <source>Installer Error</source>
diff --git a/src/sdk/translations/ifw_ru.ts b/src/sdk/translations/ifw_ru.ts
index 2783f3eef..f22b82dca 100644
--- a/src/sdk/translations/ifw_ru.ts
+++ b/src/sdk/translations/ifw_ru.ts
@@ -1708,9 +1708,9 @@ Update aborted!</source>
     </message>
     <message>
         <source>
-Installing component %1</source>
+Installing component %1...</source>
         <translation>
-Установка компонента %1</translation>
+Установка компонента %1...</translation>
     </message>
     <message>
         <source>Installer Error</source>
diff --git a/src/sdk/translations/ifw_zh_CN.ts b/src/sdk/translations/ifw_zh_CN.ts
index a826448d9..c2b55f9ec 100644
--- a/src/sdk/translations/ifw_zh_CN.ts
+++ b/src/sdk/translations/ifw_zh_CN.ts
@@ -1834,9 +1834,9 @@ Update aborted!</source>
     </message>
     <message>
         <source>
-Installing component %1</source>
+Installing component %1...</source>
         <translation>
-正在安装组件 %1</translation>
+正在安装组件 %1...</translation>
     </message>
     <message>
         <source>Installer Error</source>