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

AutoTest: Use Utils::FilePath for files and directories

Browse Source 
Still some missing bits as some QString members had different meanings
depending on their context.

Change-Id: Ib48eab54498974a26bbd5123cbffeefee5f7e79c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2021-05-26 15:50:03 +02:00
parent e8286088b1
commit 5525f2b112
70 changed files with 376 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/autotest/testconfiguration.h
View File

@@ -61,9 +61,9 @@ public:
void setEnvironment(const Utils::Environment &env) { m_runnable.environment = env; }
Utils::Environment environment() const { return m_runnable.environment; }
void setWorkingDirectory(const QString &workingDirectory);
QString workingDirectory() const;
Utils::FilePath workingDirectory() const;
bool hasExecutable() const;
QString executableFilePath() const;
Utils::FilePath executableFilePath() const;
virtual TestOutputReader *outputReader(const QFutureInterface<TestResultPtr> &fi,
QProcess *app) const = 0;
@@ -99,16 +99,16 @@ public:
void setTestCases(const QStringList &testCases);
void setExecutableFile(const QString &executableFile);
void setProjectFile(const QString &projectFile);
void setBuildDirectory(const QString &buildDirectory);
void setProjectFile(const Utils::FilePath &projectFile);
void setBuildDirectory(const Utils::FilePath &buildDirectory);
void setInternalTarget(const QString &target);
void setInternalTargets(const QSet<QString> &targets);
void setOriginalRunConfiguration(ProjectExplorer::RunConfiguration *runConfig);
ITestFramework *framework() const;
QStringList testCases() const { return m_testCases; }
QString buildDirectory() const { return m_buildDir; }
QString projectFile() const { return m_projectFile; }
Utils::FilePath buildDirectory() const { return m_buildDir; }
Utils::FilePath projectFile() const { return m_projectFile; }
QSet<QString> internalTargets() const { return m_buildTargets; }
ProjectExplorer::RunConfiguration *originalRunConfiguration() const { return m_origRunConfig; }
Internal::TestRunConfiguration *runConfiguration() const { return m_runConfig; }
@@ -120,8 +120,8 @@ public:
private:
QStringList m_testCases;
QString m_projectFile;
QString m_buildDir;
Utils::FilePath m_projectFile;
Utils::FilePath m_buildDir;
QString m_deducedFrom;
bool m_deducedConfiguration = false;
Internal::TestRunConfiguration *m_runConfig = nullptr;