forked from qt-creator/qt-creator
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:
@@ -37,6 +37,7 @@
|
|||||||
#include <coreplugin/progressmanager/futureprogress.h>
|
#include <coreplugin/progressmanager/futureprogress.h>
|
||||||
#include <coreplugin/progressmanager/progressmanager.h>
|
#include <coreplugin/progressmanager/progressmanager.h>
|
||||||
|
|
||||||
|
#include <projectexplorer/buildconfiguration.h>
|
||||||
#include <projectexplorer/buildmanager.h>
|
#include <projectexplorer/buildmanager.h>
|
||||||
#include <projectexplorer/project.h>
|
#include <projectexplorer/project.h>
|
||||||
#include <projectexplorer/projectexplorer.h>
|
#include <projectexplorer/projectexplorer.h>
|
||||||
@@ -65,6 +66,7 @@
|
|||||||
|
|
||||||
#include <utils/algorithm.h>
|
#include <utils/algorithm.h>
|
||||||
|
|
||||||
|
using namespace ProjectExplorer;
|
||||||
using namespace Utils;
|
using namespace Utils;
|
||||||
|
|
||||||
namespace Autotest {
|
namespace Autotest {
|
||||||
@@ -340,7 +342,11 @@ void TestRunner::prepareToRunTests(TestRunMode mode)
|
|||||||
if (!projectExplorerSettings.buildBeforeDeploy || mode == TestRunMode::DebugWithoutDeploy
|
if (!projectExplorerSettings.buildBeforeDeploy || mode == TestRunMode::DebugWithoutDeploy
|
||||||
|| mode == TestRunMode::RunWithoutDeploy) {
|
|| mode == TestRunMode::RunWithoutDeploy) {
|
||||||
runOrDebugTests();
|
runOrDebugTests();
|
||||||
} else if (project->hasActiveBuildSettings()) {
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Target *target = project->activeTarget();
|
||||||
|
if (target && BuildConfigurationFactory::find(target)) {
|
||||||
buildProject(project);
|
buildProject(project);
|
||||||
} else {
|
} else {
|
||||||
reportResult(ResultType::MessageFatal,
|
reportResult(ResultType::MessageFatal,
|
||||||
|
@@ -249,11 +249,6 @@ Utils::FilePath Project::projectFilePath() const
|
|||||||
return document()->filePath();
|
return document()->filePath();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Project::hasActiveBuildSettings() const
|
|
||||||
{
|
|
||||||
return activeTarget() && BuildConfigurationFactory::find(activeTarget());
|
|
||||||
}
|
|
||||||
|
|
||||||
void Project::addTarget(std::unique_ptr<Target> &&t)
|
void Project::addTarget(std::unique_ptr<Target> &&t)
|
||||||
{
|
{
|
||||||
auto pointer = t.get();
|
auto pointer = t.get();
|
||||||
|
@@ -116,8 +116,6 @@ public:
|
|||||||
virtual ProjectNode *rootProjectNode() const;
|
virtual ProjectNode *rootProjectNode() const;
|
||||||
ContainerNode *containerNode() const;
|
ContainerNode *containerNode() const;
|
||||||
|
|
||||||
bool hasActiveBuildSettings() const;
|
|
||||||
|
|
||||||
// EditorConfiguration:
|
// EditorConfiguration:
|
||||||
EditorConfiguration *editorConfiguration() const;
|
EditorConfiguration *editorConfiguration() const;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user