summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cpptoolstestcase.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2017-01-19 16:44:22 +0100
committerTim Jenssen <tim.jenssen@qt.io>2017-01-20 12:17:10 +0000
commitc6f90e575e2e261f7fa50f951b6fc1824ae5c12f (patch)
tree7f3564ad1491a5f40e64bcee89d70b884409885f /src/plugins/cpptools/cpptoolstestcase.cpp
parente6017c40fca059b27e449f0605f4d79b78de0ff3 (diff)
downloadqt-creator-c6f90e575e2e261f7fa50f951b6fc1824ae5c12f.tar.gz
Utils: Introduce a TemporaryDirectory and TemporaryFile class
Both wrap the corresponding Qt class, but make sure all temporary files or directories are created inside a "master temporary directory". Change-Id: I55461be507c828c965224c02863ea5ed9bbf9498 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cpptoolstestcase.cpp')
-rw-r--r--src/plugins/cpptools/cpptoolstestcase.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp
index efe935997d..928d8a0f22 100644
--- a/src/plugins/cpptools/cpptoolstestcase.cpp
+++ b/src/plugins/cpptools/cpptoolstestcase.cpp
@@ -43,6 +43,7 @@
#include <cplusplus/CppDocument.h>
#include <utils/executeondestruction.h>
#include <utils/fileutils.h>
+#include <utils/temporarydirectory.h>
#include <QtTest>
@@ -83,7 +84,7 @@ QString TestDocument::filePath() const
return QDir::cleanPath(m_baseDirectory + QLatin1Char('/') + m_fileName);
if (!QFileInfo(m_fileName).isAbsolute())
- return QDir::tempPath() + QLatin1Char('/') + m_fileName;
+ return Utils::TemporaryDirectory::masterDirectoryPath() + '/' + m_fileName;
return m_fileName;
}
@@ -301,8 +302,8 @@ ProjectInfo ProjectOpenerAndCloser::open(const QString &projectFile, bool config
}
TemporaryDir::TemporaryDir()
- : m_temporaryDir(QFileInfo(QDir::tempPath()).canonicalFilePath()
- + QLatin1String("/qtcreator-tests-XXXXXX"))
+ : m_temporaryDir(QFileInfo(Utils::TemporaryDirectory::masterDirectoryPath()).canonicalFilePath()
+ + "/qtcreator-tests-XXXXXX")
, m_isValid(m_temporaryDir.isValid())
{
}