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

Utils/ProjectExplorer: Use FilePath for Runnable::workingDirectory

Browse Source 
... and in some using code.

Change-Id: I231ea56628908f7d305d13f07eabe8803fe8a791
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-08-02 18:02:10 +02:00
parent b8f369c436
commit 4a42bcd4e8
44 changed files with 92 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/ctest/ctesttreeitem.cpp
View File

@@ -125,7 +125,7 @@ QList<ITestConfiguration *> CTestTreeItem::testConfigurationsFor(const QStringLi
}
const ProjectExplorer::BuildConfiguration *buildConfig = target->activeBuildConfiguration();
if (QTC_GUARD(buildConfig))
config->setWorkingDirectory(buildConfig->buildDirectory().toString());
config->setWorkingDirectory(buildConfig->buildDirectory());
if (selected.isEmpty())
config->setTestCaseCount(testBase()->asTestTool()->rootNode()->childCount());

7
src/plugins/autotest/testconfiguration.cpp
View File

@@ -57,7 +57,7 @@ ITestConfiguration::ITestConfiguration(Autotest::ITestBase *testBase)
{
}
void ITestConfiguration::setWorkingDirectory(const QString &workingDirectory)
void ITestConfiguration::setWorkingDirectory(const FilePath &workingDirectory)
{
m_runnable.workingDirectory = workingDirectory;
}
@@ -65,9 +65,8 @@ void ITestConfiguration::setWorkingDirectory(const QString &workingDirectory)
Utils::FilePath ITestConfiguration::workingDirectory() const
{
if (!m_runnable.workingDirectory.isEmpty()) {
const QFileInfo info(m_runnable.workingDirectory);
if (info.isDir()) // ensure wanted working dir does exist
return Utils::FilePath::fromString(info.absoluteFilePath());
if (m_runnable.workingDirectory.isDir()) // ensure wanted working dir does exist
return m_runnable.workingDirectory.absoluteFilePath();
}
const Utils::FilePath executable = executableFilePath();

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

@@ -60,7 +60,7 @@ public:
void setEnvironment(const Utils::Environment &env) { m_runnable.environment = env; }
Utils::Environment environment() const { return m_runnable.environment; }
void setWorkingDirectory(const QString &workingDirectory);
void setWorkingDirectory(const Utils::FilePath &workingDirectory);
Utils::FilePath workingDirectory() const;
bool hasExecutable() const;
Utils::FilePath executableFilePath() const;

2
src/plugins/autotest/testrunconfiguration.h
View File

@@ -67,7 +67,7 @@ public:
QTC_ASSERT(m_testConfig, return r);
r.executable = m_testConfig->executableFilePath();
r.commandLineArguments = m_testConfig->argumentsForTestRunner().join(' ');
r.workingDirectory = m_testConfig->workingDirectory().toString();
r.workingDirectory = m_testConfig->workingDirectory();
r.environment = m_testConfig->environment();
return r;
}

2
src/plugins/autotest/testrunner.cpp
View File

@@ -911,7 +911,7 @@ void RunConfigurationSelectionDialog::populate()
auto runnable = rc->runnable();
const QStringList rcDetails = { runnable.executable.toString(),
runnable.commandLineArguments,
runnable.workingDirectory };
runnable.workingDirectory.toString() };
m_rcCombo->addItem(rc->displayName(), rcDetails);
}
}