diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-11-07 16:48:49 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-11-07 16:48:49 +0100 |
| commit | a1a59d3e329ae70f4c6c38698316345f1c80595f (patch) | |
| tree | 39248814d9423a076a2d37d1a8a93eed959b7e22 | |
| parent | 9c5b17308b2f94c7e1cf2545d99d6baae432b6f7 (diff) | |
| parent | 9d813bc8d9f94e50e2394ffbbd408941a3f8f90c (diff) | |
Merge remote-tracking branch 'origin/1.4' into 1.5
Change-Id: I559345600da059e456ea61faac5ba33c66fa0e3c
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 578afdfc4..884bc849d 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -400,8 +400,8 @@ bool PackageManagerCorePrivate::buildComponentTree(QHash<QString, Component*> &c void PackageManagerCorePrivate::cleanUpComponentEnvironment() { - // clean up already downloaded data - if (QInstallerCreator::BinaryFormatEngineHandler::instance()) + // clean up already downloaded data, don't reset registered archives in offline installer case + if (QInstallerCreator::BinaryFormatEngineHandler::instance() && !m_core->isInstaller()) QInstallerCreator::BinaryFormatEngineHandler::instance()->resetRegisteredArchives(); // there could be still some references to already deleted components, |