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

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());