forked from qt-creator/qt-creator
CppEditor: Proliferate FilePath in cppsourceprocessertesthelper.*
Change-Id: I70e454e7cd487c8d678ddfd4dbbfac93cd261474 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
@@ -27,14 +27,14 @@ QString TestIncludePaths::globalIncludePath()
|
|||||||
return QDir::cleanPath(includeBaseDirectory() + QLatin1String("/global"));
|
return QDir::cleanPath(includeBaseDirectory() + QLatin1String("/global"));
|
||||||
}
|
}
|
||||||
|
|
||||||
QString TestIncludePaths::directoryOfTestFile()
|
FilePath TestIncludePaths::directoryOfTestFile()
|
||||||
{
|
{
|
||||||
return QDir::cleanPath(includeBaseDirectory() + QLatin1String("/local"));
|
return FilePath::fromString(QDir::cleanPath(includeBaseDirectory())) / "local";
|
||||||
}
|
}
|
||||||
|
|
||||||
FilePath TestIncludePaths::testFilePath(const QString &fileName)
|
FilePath TestIncludePaths::testFilePath(const QString &fileName)
|
||||||
{
|
{
|
||||||
return FilePath::fromString(directoryOfTestFile()) / fileName;
|
return directoryOfTestFile() / fileName;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // CppEditor::Tests::Internal
|
} // CppEditor::Tests::Internal
|
||||||
|
@@ -18,7 +18,7 @@ public:
|
|||||||
static QString includeBaseDirectory();
|
static QString includeBaseDirectory();
|
||||||
static QString globalQtCoreIncludePath();
|
static QString globalQtCoreIncludePath();
|
||||||
static QString globalIncludePath();
|
static QString globalIncludePath();
|
||||||
static QString directoryOfTestFile();
|
static Utils::FilePath directoryOfTestFile();
|
||||||
static Utils::FilePath testFilePath(const QString &fileName = QLatin1String("file.cpp"));
|
static Utils::FilePath testFilePath(const QString &fileName = QLatin1String("file.cpp"));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user