AutoTest/ProjectExplorer: Move some unusual function towards only user

Change-Id: I1101a21871c8b1eac5c01afc033e5416850bc794
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-08-13 15:25:45 +02:00
parent 6e63a0757b
commit d2a0b13252
3 changed files with 7 additions and 8 deletions

View File

@@ -37,6 +37,7 @@
#include <coreplugin/progressmanager/futureprogress.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h>
@@ -65,6 +66,7 @@
#include <utils/algorithm.h>
using namespace ProjectExplorer;
using namespace Utils;
namespace Autotest {
@@ -340,7 +342,11 @@ void TestRunner::prepareToRunTests(TestRunMode mode)
if (!projectExplorerSettings.buildBeforeDeploy || mode == TestRunMode::DebugWithoutDeploy
|| mode == TestRunMode::RunWithoutDeploy) {
runOrDebugTests();
} else if (project->hasActiveBuildSettings()) {
return;
}
Target *target = project->activeTarget();
if (target && BuildConfigurationFactory::find(target)) {
buildProject(project);
} else {
reportResult(ResultType::MessageFatal,

View File

@@ -249,11 +249,6 @@ Utils::FilePath Project::projectFilePath() const
return document()->filePath();
}
bool Project::hasActiveBuildSettings() const
{
return activeTarget() && BuildConfigurationFactory::find(activeTarget());
}
void Project::addTarget(std::unique_ptr<Target> &&t)
{
auto pointer = t.get();

View File

@@ -116,8 +116,6 @@ public:
virtual ProjectNode *rootProjectNode() const;
ContainerNode *containerNode() const;
bool hasActiveBuildSettings() const;
// EditorConfiguration:
EditorConfiguration *editorConfiguration() const;