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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Change-Id: Ibb932efece05a5f5613823fbc79c5b7601c73905
This commit is contained in:
Orgad Shaneh
2016-11-02 16:52:58 +02:00
parent 7b70c30750 63bed77178
commit 410211e090
103 changed files with 5510 additions and 2920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,7 +229,7 @@ CMakeGeneratorKitConfigWidget::~CMakeGeneratorKitConfigWidget()
QString CMakeGeneratorKitConfigWidget::displayName() const
{
return tr("CMake Generator:");
return tr("CMake generator:");
}
void CMakeGeneratorKitConfigWidget::makeReadOnly()
@@ -299,7 +299,7 @@ void CMakeGeneratorKitConfigWidget::changeGenerator()
layout->addWidget(generatorCombo, row, 1);
++row;
layout->addWidget(new QLabel(tr("Extra Generator:")), row, 0);
layout->addWidget(new QLabel(tr("Extra generator:")), row, 0);
layout->addWidget(extraGeneratorCombo, row, 1);
++row;

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

@@ -431,7 +431,7 @@ KitInformation::ItemList CMakeGeneratorKitInformation::toUserOutput(const Kit *k
if (info.generator.isEmpty()) {
message = tr("<Use Default Generator>");
} else {
message = tr("Generator: %1<br>Extra Generator: %2").arg(info.generator).arg(info.extraGenerator);
message = tr("Generator: %1<br>Extra generator: %2").arg(info.generator).arg(info.extraGenerator);
if (!info.platform.isEmpty())
message += tr("<br>Platform: %1").arg(info.platform);
if (!info.toolset.isEmpty())