Merge remote-tracking branch 'origin/1.4' into 1.5

Change-Id: Ib2d382d1aa398b642dc15f4df7c03b19bf638546

1 files changed, 12 insertions, 9 deletions

diff --git a/src/libs/installer/fileutils.cpp b/src/libs/installer/fileutils.cpp
index 010c30621..c7c7436bb 100644
--- a/src/libs/installer/fileutils.cpp
+++ b/src/libs/installer/fileutils.cpp
@@ -289,8 +289,7 @@ void QInstaller::removeDirectory(const QString &path, bool ignoreErrors)
     QDirIterator it(path, QDir::NoDotAndDotDot | QDir::Dirs | QDir::NoSymLinks | QDir::Hidden,
         QDirIterator::Subdirectories);
     while (it.hasNext()) {
-        it.next();
-        dirs.prepend(it.filePath());
+        dirs.prepend(it.next());
         removeFiles(dirs.at(0), ignoreErrors);
     }
 
@@ -461,14 +460,18 @@ QString QInstaller::generateTemporaryFileName(const QString &templ)
     return f.fileName();
 }
 
-QString QInstaller::createTemporaryDirectory(const QString &templ)
+QString QInstaller::createTemporaryDirectory(const QString &templateName)
 {
-    const QString t = QDir::tempPath() + QLatin1String("/") + templ + QLatin1String("XXXXXX");
-    QTemporaryFile f(t);
-    if (!f.open())
-        throw Error(QObject::tr("Could not create temporary folder for template %1: %2").arg(t, f.errorString()));
-    const QString path = f.fileName() + QLatin1String("meta");
-    qDebug() << "\nCreating meta data directory at" << path;
+    QString path = QDir::tempPath() + QLatin1String("/") + templateName + QLatin1String("XXXXXX");
+    {
+        QTemporaryFile f(path);
+        if (!f.open()) {
+            throw Error(QObject::tr("Could not create temporary directory %1: %2").arg(f.fileName(),
+                f.errorString()));
+        }
+        path = f.fileName();
+    }
+    qDebug() << "\nCreating temporary directory at:" << path;
 
     QInstaller::mkpath(path);
     return path;