diff options
| author | con <qtc-committer@nokia.com> | 2010-05-04 17:48:38 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-05-04 17:48:38 +0200 |
| commit | a186982d4f2f51e8651d66804d155d530ace22d6 (patch) | |
| tree | cde401e1e13ff68713fc5750d9f6ee7f22c88666 /src/plugins/perforce | |
| parent | 08f522d93c45010da10a2ebcc1d41692cd66303a (diff) | |
| parent | 5e3eb47e556c252d97a4b66dd031918e313d7901 (diff) | |
| download | qt-creator-a186982d4f2f51e8651d66804d155d530ace22d6.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
doc/qt-html-templates.qdocconf
doc/qtcreator.qdocconf
Diffstat (limited to 'src/plugins/perforce')
| -rw-r--r-- | src/plugins/perforce/settingspage.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/perforce/settingspage.cpp b/src/plugins/perforce/settingspage.cpp index b0ab255ef5..7f037488f1 100644 --- a/src/plugins/perforce/settingspage.cpp +++ b/src/plugins/perforce/settingspage.cpp @@ -46,6 +46,7 @@ SettingsPageWidget::SettingsPageWidget(QWidget *parent) : QWidget(parent) { m_ui.setupUi(this); + m_ui.errorLabel->clear(); m_ui.pathChooser->setPromptDialogTitle(tr("Perforce Command")); m_ui.pathChooser->setExpectedKind(PathChooser::Command); connect(m_ui.testPushButton, SIGNAL(clicked()), this, SLOT(slotTest())); |