diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-08-19 16:39:18 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-08-19 16:39:18 +0200 |
commit | c417d953f743b8a273ea36ff7d7b1dc8b761d518 (patch) | |
tree | 4bc08bf733ba04a7846db8289ba7003a961bad82 /src/sdk/installerbase.cpp | |
parent | c53747138d2f48138ee6e12149064344e668634d (diff) | |
parent | d343cd20410ecb2741c85877c8203579dc7c227d (diff) |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
Changelog
dist/config/config.xml
dist/packages/org.qtproject.ifw.binaries/meta/package.xml
dist/packages/org.qtproject.ifw/meta/package.xml
installerfw.pri
src/libs/installer/component.cpp
src/libs/kdtools/updatesinfo.cpp
Change-Id: I0a1b4a464f7d9008b589b54dd7aed0cac71bd666
Diffstat (limited to 'src/sdk/installerbase.cpp')
-rw-r--r-- | src/sdk/installerbase.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index 0557f36a2..38ff0e406 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -107,6 +107,12 @@ int InstallerBase::run() QInstaller::BinaryContent::readBinaryContent(&binary, &oldOperations, &manager, &magicMarker, cookie); + // Usually resources simply get mapped into memory and therefore the file does not need to be + // kept open during application runtime. Though in case of offline installers we need to access + // the appended binary content (packages etc.), so we close only in maintenance mode. + if (magicMarker != QInstaller::BinaryContent::MagicInstallerMarker) + binary.close(); + CommandLineParser parser; parser.parse(arguments()); |