Merge remote-tracking branch 'origin/2.0'

Conflicts:
	src/libs/installer/packagemanagercore.cpp

Change-Id: Ie3d94fe3a633e189c260bf20682c00a2bb901bc8

1 files changed, 9 insertions, 0 deletions

diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 46a38ab8a..ed95ddd4b 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -997,6 +997,15 @@ void PackageManagerCorePrivate::writeMaintenanceToolBinary(QFile *const input, q
         QInstaller::appendInt64(&dataOut, 4 * sizeof(qint64));   // data block size
         QInstaller::appendInt64(&dataOut, BinaryContent::MagicUninstallerMarker);
         QInstaller::appendInt64(&dataOut, BinaryContent::MagicCookie);
+
+        {
+            QFile dummy(resourcePath.filePath(QLatin1String("installer.dat")));
+            if (dummy.exists() && !dummy.remove()) {
+                throw Error(tr("Could not remove data file '%1': %2").arg(dummy.fileName(),
+                    dummy.errorString()));
+            }
+        }
+
         if (!dataOut.rename(resourcePath.filePath(QLatin1String("installer.dat")))) {
             throw Error(tr("Could not write maintenance tool data to %1: %2").arg(out.fileName(),
                 out.errorString()));