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

Finish merging Runnable and StandardRunnable

Browse Source 
As all Runnables are known to be StandardRunnables, this here
essentially replaces all .is<StandardRunnable> by 'true'.
.as<StandardRunnable> by no-op, and fixes the fallout.

Change-Id: I1632f8e164fa0a9dff063df47a9e191fdf7bbb2e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2018-05-16 15:42:03 +02:00
parent fdccc54275
commit 36b835ff0a
73 changed files with 147 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -336,9 +336,7 @@ static ProjectExplorer::RunConfiguration *getRunConfiguration(const QString &dia
RunConfiguration *runConfig = nullptr;
const QList<RunConfiguration *> runConfigurations
= Utils::filtered(target->runConfigurations(), [] (const RunConfiguration *rc) {
if (!rc->runnable().is<StandardRunnable>())
return false;
return !rc->runnable().as<StandardRunnable>().executable.isEmpty();
return !rc->runnable().executable.isEmpty();
});
if (runConfigurations.size() == 1)
return runConfigurations.first();
@@ -353,7 +351,7 @@ static ProjectExplorer::RunConfiguration *getRunConfiguration(const QString &dia
runConfig = Utils::findOr(runConfigurations, nullptr, [&dName, &exe] (const RunConfiguration *rc) {
if (rc->displayName() != dName)
return false;
return rc->runnable().as<StandardRunnable>().executable == exe;
return rc->runnable().executable == exe;
});
}
return runConfig;
@@ -489,7 +487,7 @@ void TestRunner::debugTests()
}
QStringList omitted;
ProjectExplorer::StandardRunnable inferior = config->runnable();
ProjectExplorer::Runnable inferior = config->runnable();
inferior.executable = commandFilePath;
const QStringList args = config->argumentsForTestRunner(&omitted);
@@ -660,13 +658,11 @@ void RunConfigurationSelectionDialog::populate()
if (auto project = ProjectExplorer::SessionManager::startupProject()) {
if (auto target = project->activeTarget()) {
for (ProjectExplorer::RunConfiguration *rc : target->runConfigurations()) {
if (rc->runnable().is<ProjectExplorer::StandardRunnable>()) {
auto runnable = rc->runnable().as<ProjectExplorer::StandardRunnable>();
const QStringList rcDetails = { runnable.executable,
runnable.commandLineArguments,
runnable.workingDirectory };
m_rcCombo->addItem(rc->displayName(), rcDetails);
}
auto runnable = rc->runnable();
const QStringList rcDetails = { runnable.executable,
runnable.commandLineArguments,
runnable.workingDirectory };
m_rcCombo->addItem(rc->displayName(), rcDetails);
}
}
}