Merge remote-tracking branch 'origin/3.0' into master

Change-Id: Ic74ee1485204e09e2baa384468b581ba0d9c79cd

1 files changed, 7 insertions, 0 deletions

diff --git a/src/libs/kdtools/updateoperations.cpp b/src/libs/kdtools/updateoperations.cpp
index 1620a36c4..856431f84 100644
--- a/src/libs/kdtools/updateoperations.cpp
+++ b/src/libs/kdtools/updateoperations.cpp
@@ -29,6 +29,8 @@
 #include "updateoperations.h"
 #include "errors.h"
 #include "fileutils.h"
+#include "constants.h"
+#include "packagemanagercore.h"
 
 #include <QDir>
 #include <QFile>
@@ -462,6 +464,11 @@ bool MkdirOperation::undoOperation()
     Q_ASSERT(arguments().count() == 1);
 
     QString createdDirValue = value(QLatin1String("createddir")).toString();
+    if (packageManager()) {
+        createdDirValue = QInstaller::replacePath(createdDirValue,
+            QLatin1String(QInstaller::scRelocatable), packageManager()->value(QInstaller::scTargetDir));
+    }
+
     if (createdDirValue.isEmpty())
         createdDirValue = arguments().first();
     QDir createdDir = QDir(createdDirValue);