diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2022-11-25 11:23:48 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2022-12-12 09:22:30 +0200 |
| commit | 662110e1594788ddc54ec379d61776e1bdd82670 (patch) | |
| tree | d8fe6fab8b2bb46fff170affdf421f52ef8797c5 /src/libs | |
| parent | 7af2e1aadbee766eae334fe605dcf59af047bfe1 (diff) | |
Add test for essential content sha update
Also clearing the foundEssentialUpdate flag in clearAllComponentLists()
function so that unit tests core status will match. As the unit tests
are not done to fully cleared core the foundEssentialUpdate was set to
true although the update was done and other components were installed.
Task-number: QTIFW-2732
Change-Id: I9b6754595b4b20b1ddc95d7587d98474a6967add
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 2 | ||||
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 3a30244f2..9b77dd657 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -497,6 +497,7 @@ void PackageManagerCorePrivate::clearAllComponentLists() m_componentsToReplaceAllMode.clear(); m_componentsToInstallCalculated = false; + m_foundEssentialUpdate = false; qDeleteAll(toDelete); cleanUpComponentEnvironment(); @@ -522,6 +523,7 @@ void PackageManagerCorePrivate::clearUpdaterComponentLists() m_componentsToReplaceUpdaterMode.clear(); m_componentsToInstallCalculated = false; + m_foundEssentialUpdate = false; qDeleteAll(usedComponents); cleanUpComponentEnvironment(); diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h index 03047240c..d45e2f219 100644 --- a/src/libs/installer/packagemanagercore_p.h +++ b/src/libs/installer/packagemanagercore_p.h @@ -294,7 +294,7 @@ private: int m_magicMarkerSupplement; bool m_componentsToInstallCalculated; - bool m_foundEssentialUpdate;; + bool m_foundEssentialUpdate; mutable ScriptEngine *m_componentScriptEngine; mutable ScriptEngine *m_controlScriptEngine; |