diff options
author | Katja Marttila <katja.marttila@qt.io> | 2018-10-11 12:31:17 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2018-10-16 05:41:33 +0000 |
commit | 47ae652577a1013736a04e3c9a105b9094fe1ed6 (patch) | |
tree | 692dc78de2d489127b7862416198e935a799a330 /src/sdk/installerbase.cpp | |
parent | 9d7cff74d94e3a9ee2beaccfa5aa6a15a93585cb (diff) |
Do not reset core data values in restart
Do not reset core data values as that removes all data set using
setValue() which are needed. Restart is called when pressing 'Restart' after
maintenancetool finish page or when changing settings from Settings
Dialog.
Task-number QTIFW-504
Change-Id: I0713b0371811957b93623433d26f0b10e4c8fb12
Reviewed-by: Janne Anttila <janne.anttila@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'src/sdk/installerbase.cpp')
-rw-r--r-- | src/sdk/installerbase.cpp | 12 |
1 files changed, 2 insertions, 10 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()); |