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/qmlprojectmanager/qmlprojectrunconfigurationwidget.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/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp index 4aebcc0ac0..cb60db1262 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp @@ -94,7 +94,7 @@ QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRun this, SLOT(onQtVersionSelectionChanged())); QPushButton *pushButton = new QPushButton; - pushButton->setText(tr("Manage Qt versions")); + pushButton->setText(tr("Manage Qt versions...")); connect(pushButton, SIGNAL(clicked()), this, SLOT(manageQtVersions())); QHBoxLayout *qtVersionLayout = new QHBoxLayout; |