diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-10-18 13:50:38 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-10-18 13:50:38 +0200 |
commit | 0164e1bea219fc82cb1482b6c66683f48cda212d (patch) | |
tree | 033b82cf1d73ffa162e93326a0e3eb9969e84711 /src/plugins/cpptools/cppfilesettingspage.cpp | |
parent | aa95055eb06c307f571db035af13a60b5dc293d8 (diff) | |
parent | dd324e06345ba2901671c00f7a122bd0dccb5f28 (diff) | |
download | qt-creator-0164e1bea219fc82cb1482b6c66683f48cda212d.tar.gz |
Merge branch '2.3' into 2.4
Conflicts:
src/plugins/debugger/commonoptionspage.ui
src/plugins/madde/maemoqtversion.cpp
src/plugins/projectexplorer/runsettingspropertiespage.ui
Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
Diffstat (limited to 'src/plugins/cpptools/cppfilesettingspage.cpp')
-rw-r--r-- | src/plugins/cpptools/cppfilesettingspage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index 8638d5ad6b..4372e80d7d 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -247,7 +247,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) : foreach (const QString &suffix, headerMt.suffixes()) m_ui->headerSuffixComboBox->addItem(suffix); m_ui->licenseTemplatePathChooser->setExpectedKind(Utils::PathChooser::File); - m_ui->licenseTemplatePathChooser->addButton(tr("Edit"), this, SLOT(slotEdit())); + m_ui->licenseTemplatePathChooser->addButton(tr("Edit..."), this, SLOT(slotEdit())); } CppFileSettingsWidget::~CppFileSettingsWidget() |