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

Change-Id: If5205ff6ef2c8989520e24d41595c04d5920d207

2 files changed, 9 insertions, 5 deletions

diff --git a/src/libs/kdtools/filedownloader.cpp b/src/libs/kdtools/filedownloader.cpp
index 9532aef62..ea8fdd23b 100644
--- a/src/libs/kdtools/filedownloader.cpp
+++ b/src/libs/kdtools/filedownloader.cpp
@@ -813,9 +813,9 @@ void KDUpdater::LocalFileDownloader::doDownload()
     QString localFile = this->url().toLocalFile();
     d->source = new QFile(localFile, this);
     if (!d->source->open(QFile::ReadOnly)) {
-        onError();
         setDownloadAborted(tr("Cannot open file \"%1\" for reading: %2").arg(QFileInfo(localFile)
-            .fileName(), d->source ? d->source->errorString() : tr("File not found")));
+            .fileName(), d->source->errorString()));
+        onError();
         return;
     }
 
@@ -829,9 +829,9 @@ void KDUpdater::LocalFileDownloader::doDownload()
     }
 
     if (!d->destination->isOpen()) {
-        onError();
         setDownloadAborted(tr("Cannot open file \"%1\" for writing: %2")
             .arg(QFileInfo(d->destination->fileName()).fileName(), d->destination->errorString()));
+        onError();
         return;
     }
 
@@ -902,10 +902,10 @@ void KDUpdater::LocalFileDownloader::timerEvent(QTimerEvent *event)
             if (numWritten < 0) {
                 killTimer(d->timerId);
                 d->timerId = -1;
-                onError();
                 setDownloadAborted(tr("Writing to file \"%1\" failed: %2").arg(
                                        QDir::toNativeSeparators(d->destination->fileName()),
                                        d->destination->errorString()));
+                onError();
                 return;
             }
             toWrite -= numWritten;
@@ -1090,11 +1090,11 @@ void KDUpdater::ResourceFileDownloader::timerEvent(QTimerEvent *event)
 {
     if (event->timerId() == d->timerId) {
         if (!d->destFile.isOpen()) {
-            onError();
             killTimer(d->timerId);
             emit downloadProgress(1);
             setDownloadAborted(tr("Cannot read resource file \"%1\": %2").arg(downloadedFileName(),
                 d->destFile.errorString()));
+            onError();
             return;
         }
 
diff --git a/src/libs/kdtools/updateoperation.cpp b/src/libs/kdtools/updateoperation.cpp
index 73e904da5..b884fa9fa 100644
--- a/src/libs/kdtools/updateoperation.cpp
+++ b/src/libs/kdtools/updateoperation.cpp
@@ -505,6 +505,10 @@ bool UpdateOperation::fromXml(const QDomDocument &doc)
                 }
                 var = QVariant::fromValue(list);
             }
+        } else if (t == QVariant::String) {
+              const QString str = QInstaller::replacePath(value,
+                        QLatin1String(QInstaller::scRelocatable), target);
+              var = QVariant::fromValue(str);
         }
 
         m_values[name] = var;