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

Change-Id: I4c2d440a82ceb4d48a97c78fa14fb15cc56596f0

2 files changed, 7 insertions, 8 deletions

diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 5e98ea1de..d2c732ddb 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -2702,6 +2702,8 @@ PackageManagerCore::Status PackageManagerCore::installSelectedComponentsSilently
 
     QString errorMessage;
     if (checkComponentsForInstallation(components, errorMessage)) {
+        if (!errorMessage.isEmpty())
+            qCDebug(QInstaller::lcInstallerInstallLog).noquote().nospace() << errorMessage;
         if (d->calculateComponentsAndRun())
             qCDebug(QInstaller::lcInstallerInstallLog) << "Components installed successfully";
     } else {
diff --git a/src/libs/kdtools/updateoperation.cpp b/src/libs/kdtools/updateoperation.cpp
index c3961663a..998d33094 100644
--- a/src/libs/kdtools/updateoperation.cpp
+++ b/src/libs/kdtools/updateoperation.cpp
@@ -549,21 +549,18 @@ bool UpdateOperation::fromXml(const QDomDocument &doc)
         if (!e.isNull() && e.tagName() == QLatin1String("argument")) {
             // Sniff the Execute -operations file path separator. The operation might be
             // strict with the used path separator
+            bool useCleanPath = true;
             if (name() == QLatin1String("Execute")) {
                 if (e.text().startsWith(relocatable) && e.text().size() > relocatable.size()) {
                     const QChar separator = e.text().at(relocatable.size());
                     if (separator == QLatin1Char('\\')) {
-                        args << QInstaller::replacePath(e.text(), relocatable,
-                            QDir::toNativeSeparators(target), false);
+                        target = QDir::toNativeSeparators(target);
+                        useCleanPath = false;
                     }
-                } else {
-                    args << QInstaller::replacePath(e.text(), relocatable,
-                        target);
                 }
-            } else {
-                args << QInstaller::replacePath(e.text(), relocatable,
-                    target);
             }
+            args << QInstaller::replacePath(e.text(), relocatable,
+                target, useCleanPath);
         }
     }
     setArguments(args);