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

Unittest: Fix build

Browse Source 
Amends 8e352af0ec.

Change-Id: I8130996fa68d9a5fa4217a8db001745a0382f91b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2021-04-27 10:12:36 +02:00
parent 1d7e05e6a9
commit 318b3f10ce
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/clangpchmanager/pchmanagerconnectionclient.cpp
View File

@@ -51,13 +51,13 @@ ClangPchManager::PchManagerConnectionClient::PchManagerConnectionClient(
{ {
m_processCreator.setTemporaryDirectoryPattern("clangpchmanagerbackend-XXXXXX"); m_processCreator.setTemporaryDirectoryPattern("clangpchmanagerbackend-XXXXXX");
QDir pchsDirectory(Core::ICore::cacheResourcePath()); QDir pchsDirectory(Core::ICore::cacheResourcePath().toString());
pchsDirectory.mkdir("pchs"); pchsDirectory.mkdir("pchs");
pchsDirectory.cd("pchs"); pchsDirectory.cd("pchs");
m_processCreator.setArguments({connectionName(), m_processCreator.setArguments({connectionName(),
Core::ICore::cacheResourcePath("symbol-experimental-v1.db"), Core::ICore::cacheResourcePath("symbol-experimental-v1.db").toString(),
pchsDirectory.absolutePath(), pchsDirectory.absolutePath(),
Core::ICore::resourcePath()}); Core::ICore::resourcePath().toString()});
stdErrPrefixer().setPrefix("PchManagerConnectionClient.stderr: "); stdErrPrefixer().setPrefix("PchManagerConnectionClient.stderr: ");
stdOutPrefixer().setPrefix("PchManagerConnectionClient.stdout: "); stdOutPrefixer().setPrefix("PchManagerConnectionClient.stdout: ");

15
tests/unit/mockup/coreplugin/icore.h
View File

@@ -1,20 +1,23 @@
#include "utils/fileutils.h"
#include <QDir> #include <QDir>
namespace Core { namespace Core {
namespace ICore { namespace ICore {
inline static QString userResourcePath() inline static Utils::FilePath userResourcePath()
{ {
return QDir::tempPath(); return Utils::FilePath::fromString(QDir::tempPath());
} }
inline static QString cacheResourcePath() inline static Utils::FilePath cacheResourcePath(const QString & /*rel*/ = {})
{ {
return QDir::tempPath(); return Utils::FilePath::fromString(QDir::tempPath());
} }
inline static QString resourcePath() inline static Utils::FilePath resourcePath()
{ {
return QDir::tempPath(); return Utils::FilePath::fromString(QDir::tempPath());
} }
} // namespace ICore } // namespace ICore