forked from qt-creator/qt-creator
ProjectExplorer: Move settings structures out of Internal namespace
There is a public exported API that returns these structures, and different plugins use it, so there is not point in keeping them inside Internal namespace. Remove some unused includes. Change-Id: Ia9d3fc83738c38ae37f04ae0f518ec5d972c9d85 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -351,10 +351,10 @@ void TestRunner::prepareToRunTests(TestRunMode mode)
|
||||
QTC_ASSERT(!m_executingTests, return);
|
||||
m_skipTargetsCheck = false;
|
||||
m_runMode = mode;
|
||||
ProjectExplorer::Internal::ProjectExplorerSettings projectExplorerSettings =
|
||||
ProjectExplorerPlugin::projectExplorerSettings();
|
||||
const ProjectExplorerSettings projectExplorerSettings
|
||||
= ProjectExplorerPlugin::projectExplorerSettings();
|
||||
if (mode != TestRunMode::RunAfterBuild
|
||||
&& projectExplorerSettings.buildBeforeDeploy != ProjectExplorer::Internal::BuildBeforeRunMode::Off
|
||||
&& projectExplorerSettings.buildBeforeDeploy != BuildBeforeRunMode::Off
|
||||
&& !projectExplorerSettings.saveBeforeBuild) {
|
||||
if (!ProjectExplorerPlugin::saveModifiedFiles())
|
||||
return;
|
||||
@@ -387,7 +387,7 @@ void TestRunner::prepareToRunTests(TestRunMode mode)
|
||||
m_targetConnect = connect(project, &Project::activeTargetChanged,
|
||||
this, [this] { cancelCurrent(KitChanged); });
|
||||
|
||||
if (projectExplorerSettings.buildBeforeDeploy == ProjectExplorer::Internal::BuildBeforeRunMode::Off
|
||||
if (projectExplorerSettings.buildBeforeDeploy == BuildBeforeRunMode::Off
|
||||
|| mode == TestRunMode::DebugWithoutDeploy
|
||||
|| mode == TestRunMode::RunWithoutDeploy || mode == TestRunMode::RunAfterBuild) {
|
||||
runOrDebugTests();
|
||||
|
||||
Reference in New Issue
Block a user