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

CMake: Do not bother to remember ninja support status

Browse Source 
Do not bother to remember ninja support status now that it is no longer
used.

Change-Id: Ief24af8e39ad5e39633ccb6d31858fa003de5ce8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-01-07 13:19:29 +01:00
parent 870cfdf011
commit 4756fbbfec
9 changed files with 23 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -146,10 +146,8 @@ void CMakeProject::changeActiveBuildConfiguration(ProjectExplorer::BuildConfigur
CMakeBuildInfo info(cmakebc);
CMakeOpenProjectWizard copw(Core::ICore::mainWindow(), m_manager, mode, &info,
bc->target()->displayName(), bc->displayName());
if (copw.exec() == QDialog::Accepted) {
cmakebc->setUseNinja(copw.useNinja()); // NeedToCreate can change the Ninja setting
if (copw.exec() == QDialog::Accepted)
cmakebc->setInitialArguments(QString());
}
}
// reparse
@@ -559,12 +557,10 @@ Project::RestoreResult CMakeProject::fromMap(const QVariantMap &map, QString *er
CMakeBuildInfo info(activeBC);
CMakeOpenProjectWizard copw(Core::ICore::mainWindow(), m_manager, mode, &info,
activeBC->target()->displayName(), activeBC->displayName());
if (copw.exec() != QDialog::Accepted) {
if (copw.exec() != QDialog::Accepted)
return RestoreResult::UserAbort;
} else {
activeBC->setUseNinja(copw.useNinja());
else
activeBC->setInitialArguments(QString());
}
}
}