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/libs/installer | |
| 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/libs/installer')
| -rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 9 | ||||
| -rw-r--r-- | src/libs/installer/packagemanagercore.h | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index bf78f99ff..0541cbeaa 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -449,17 +449,16 @@ void PackageManagerCore::writeMaintenanceConfigFiles() } /*! - Resets the class to its initial state and applies the values of the - parameters specified by \a params. + Resets the class to its initial state. */ -void PackageManagerCore::reset(const QHash<QString, QString> ¶ms) +void PackageManagerCore::reset() { d->m_completeUninstall = false; d->m_needsHardRestart = false; d->m_status = PackageManagerCore::Unfinished; d->m_installerBaseBinaryUnreplaced.clear(); - - d->initialize(params); + d->m_coreCheckedHash.clear(); + d->m_componentsToInstallCalculated = false; } /*! diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h index 2a235bd44..629b36766 100644 --- a/src/libs/installer/packagemanagercore.h +++ b/src/libs/installer/packagemanagercore.h @@ -125,7 +125,7 @@ public: bool fetchCompressedPackagesTree(); bool run(); - void reset(const QHash<QString, QString> ¶ms); + void reset(); void setGuiObject(QObject *gui); QObject *guiObject() const; |