Use QTemporaryDir instead of our homemade solution.

Change-Id: Ia584a9b2f954df5c29a2f0aa5f12b201b2bfbcc4
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

2 files changed, 8 insertions, 2 deletions

diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp
index c12d06851..e589c7309 100644
--- a/tools/binarycreator/binarycreator.cpp
+++ b/tools/binarycreator/binarycreator.cpp
@@ -56,6 +56,7 @@
 #include <QtCore/QProcess>
 #include <QtCore/QSettings>
 #include <QtCore/QTemporaryFile>
+#include <QTemporaryDir>
 
 #include <iostream>
 
@@ -717,7 +718,9 @@ int main(int argc, char **argv)
     qDebug() << "Parsed arguments, ok.";
 
     int exitCode = EXIT_FAILURE;
-    const QString tmpMetaDir = QInstaller::createTemporaryDirectory();
+    QTemporaryDir tmp;
+    tmp.setAutoRemove(false);
+    const QString tmpMetaDir = tmp.path();
     try {
         const Settings settings = Settings::fromFileAndPrefix(configFile, QFileInfo(configFile).absolutePath());
         QInstallerTools::PackageInfoVector packages = QInstallerTools::createListOfPackages(packagesDirectories,
diff --git a/tools/repogen/repogen.cpp b/tools/repogen/repogen.cpp
index 8107f06d3..f0fa69a76 100644
--- a/tools/repogen/repogen.cpp
+++ b/tools/repogen/repogen.cpp
@@ -52,6 +52,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QDirIterator>
 #include <QtCore/QFileInfo>
+#include <QTemporaryDir>
 
 #include <iostream>
 
@@ -251,7 +252,9 @@ int main(int argc, char** argv)
                 removeDirectory(fi.absoluteFilePath());
         }
 
-        tmpMetaDir = QInstaller::createTemporaryDirectory();
+        QTemporaryDir tmp;
+        tmp.setAutoRemove(false);
+        tmpMetaDir = tmp.path();
         QInstallerTools::copyComponentData(packagesDirectories, repositoryDir, &packages);
         QInstallerTools::copyMetaData(tmpMetaDir, repositoryDir, packages, QLatin1String("{AnyApplication}"),
             QLatin1String(QUOTE(IFW_REPOSITORY_FORMAT_VERSION)));