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

CMake: Remove "Prefer Ninja" checkbox on CMake Tool page

Browse Source 
This is no longer needed now that the generator is a property of the
Kit.

Change-Id: Ife35fd9207c805a4ead1e067603df1bfc77e6855
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-01-26 15:22:03 +01:00
parent fdeef866dd
commit 5c5e5a3aae
5 changed files with 4 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
View File

@@ -44,7 +44,6 @@
#include <QTreeView>
#include <QWidget>
#include <QUuid>
#include <QCheckBox>
using namespace Utils;
@@ -390,9 +389,6 @@ public:
m_makeDefButton->setEnabled(false);
m_makeDefButton->setToolTip(tr("Set as the default CMake Tool to use when creating a new kit or when no value is set."));
m_preferNinjaCheckBox = new QCheckBox(tr("Prefer Ninja generator (CMake 2.8.9 or higher required)"));
m_preferNinjaCheckBox->setChecked(CMakeToolManager::preferNinja());
m_container = new DetailsWidget(this);
m_container->setState(DetailsWidget::NoSummary);
m_container->setVisible(false);
@@ -421,7 +417,6 @@ public:
QVBoxLayout *verticalLayout = new QVBoxLayout();
verticalLayout->addWidget(m_cmakeToolsView);
verticalLayout->addWidget(m_container);
verticalLayout->addWidget(m_preferNinjaCheckBox);
QHBoxLayout *horizontalLayout = new QHBoxLayout(this);
horizontalLayout->addLayout(verticalLayout);
@@ -456,7 +451,6 @@ public:
QPushButton *m_cloneButton;
QPushButton *m_delButton;
QPushButton *m_makeDefButton;
QCheckBox *m_preferNinjaCheckBox;
DetailsWidget *m_container;
CMakeToolItemConfigWidget *m_itemConfigWidget;
CMakeToolTreeItem *m_currentItem;
@@ -465,7 +459,6 @@ public:
void CMakeToolConfigWidget::apply()
{
m_model.apply();
CMakeToolManager::setPreferNinja(m_preferNinjaCheckBox->checkState() == Qt::Checked);
}
void CMakeToolConfigWidget::cloneCMakeTool()