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

Change-Id: Ic74ee1485204e09e2baa384468b581ba0d9c79cd

2 files changed, 7 insertions, 10 deletions

diff --git a/src/libs/installer/componentchecker.cpp b/src/libs/installer/componentchecker.cpp
index e21bc6696..de8626329 100644
--- a/src/libs/installer/componentchecker.cpp
+++ b/src/libs/installer/componentchecker.cpp
@@ -76,16 +76,6 @@ QStringList ComponentChecker::checkComponent(Component *component)
                 "component %1. This may not work properly.")
                 .arg(component->name());
         }
-        const QStringList dependencies = component->dependencies();
-        foreach (const QString &dependency, dependencies) {
-            Component *dependencyComponent = PackageManagerCore::componentByName(
-                        dependency, allComponents);
-            if (dependencyComponent && autoDependencies.contains(dependencyComponent->name())) {
-                checkResult << QString::fromLatin1("Component %1 specifies both dependency "
-                    "and auto dependency on component %2. The dependency might be superfluous.")
-                    .arg(component->name(), dependencyComponent->name());
-            }
-        }
     }
     if (component->packageManagerCore()->isInstaller()) {
         if (component->isTristate()) {
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);