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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ib5e7c433606406d123b4a384ae1b48e2dbb26824
This commit is contained in:
Eike Ziller
2012-11-16 15:31:02 +01:00
parent 51bca85117 5981b1e550
commit 3e7d94c362
22 changed files with 100 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
View File

@@ -199,7 +199,7 @@ bool CMakeRunConfiguration::fromMap(const QVariantMap &map)
QString CMakeRunConfiguration::defaultDisplayName() const
{
if (m_title.isEmpty())
return tr("Run CMake target");
return tr("Run CMake kit");
return m_title + (m_enabled ? "" : tr(" (disabled)"));
}

4
src/plugins/cmakeprojectmanager/makestep.cpp
View File

@@ -340,7 +340,7 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
m_buildTargetsList = new QListWidget;
m_buildTargetsList->setMinimumHeight(200);
fl->addRow(tr("Targets:"), m_buildTargetsList);
fl->addRow(tr("Kits:"), m_buildTargetsList);
// TODO update this list also on rescans of the CMakeLists.txt
CMakeProject *pro = static_cast<CMakeProject *>(m_makeStep->target()->project());
@@ -400,7 +400,7 @@ void MakeStepConfigWidget::updateDetails()
if (!bc)
bc = m_makeStep->target()->activeBuildConfiguration();
if (!bc) {
m_summaryText = tr("<b>No build configuration found on this target.</b>");
m_summaryText = tr("<b>No build configuration found on this kit.</b>");
updateSummary();
return;
}