feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TemporaryDirectory: Fix failing test cases

Browse Source 
Change-Id: Ied61a1de9d226815da1eaa050a09dde30091d006
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Tobias Hunger
2017-01-24 17:29:34 +01:00
committed by Nikolai Kosjar
parent 7db35aa8ef
commit f50d73cc3c
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clanguiheaderondiskmanager.cpp
View File

@@ -33,7 +33,7 @@
namespace ClangCodeModel { namespace ClangCodeModel {
namespace Internal { namespace Internal {
UiHeaderOnDiskManager::UiHeaderOnDiskManager() : m_temporaryDir("/qtc-clang-uiheader-XXXXXX") UiHeaderOnDiskManager::UiHeaderOnDiskManager() : m_temporaryDir("qtc-clang-uiheader-XXXXXX")
{ {
QTC_CHECK(m_temporaryDir.isValid()); QTC_CHECK(m_temporaryDir.isValid());
} }

4
src/plugins/clangcodemodel/clanguiheaderondiskmanager.h
View File

@@ -25,7 +25,7 @@
#pragma once #pragma once
#include <QTemporaryDir> #include <utils/temporarydirectory.h>
namespace ClangCodeModel { namespace ClangCodeModel {
namespace Internal { namespace Internal {
@@ -43,7 +43,7 @@ public:
QString directoryPath() const; QString directoryPath() const;
private: private:
QTemporaryDir m_temporaryDir; ::Utils::TemporaryDirectory m_temporaryDir;
}; };
} // namespace Internal } // namespace Internal

3
src/plugins/cpptools/cpptoolstestcase.cpp
View File

@@ -302,8 +302,7 @@ ProjectInfo ProjectOpenerAndCloser::open(const QString &projectFile, bool config
} }
TemporaryDir::TemporaryDir() TemporaryDir::TemporaryDir()
: m_temporaryDir(QFileInfo(Utils::TemporaryDirectory::masterDirectoryPath()).canonicalFilePath() : m_temporaryDir("qtcreator-tests-XXXXXX")
+ "/qtcreator-tests-XXXXXX")
, m_isValid(m_temporaryDir.isValid()) , m_isValid(m_temporaryDir.isValid())
{ {
} }