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

FancyLineEdit: Remove property initialText

Browse Source 
The same can be easily achieved by placeholderText nowadays.

Change-Id: Icfe0652ae8536c8077cf45a03844275aa1eddad6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Andre Hartmann
2017-10-21 21:04:51 +02:00
committed by André Hartmann
parent 310a2bf96f
commit 8d1a592d16
3 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/projectintropage.cpp
View File

@@ -85,7 +85,7 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) :
{
d->m_ui.setupUi(this);
hideStatusLabel();
d->m_ui.nameLineEdit->setInitialText(tr("<Enter_Name>"));
d->m_ui.nameLineEdit->setPlaceholderText(tr("Enter project name"));
d->m_ui.nameLineEdit->setFocus();
d->m_ui.nameLineEdit->setValidationFunction([this](FancyLineEdit *edit, QString *errorString) {
return validateProjectName(edit->text(), errorString);
@@ -178,13 +178,13 @@ bool ProjectIntroPage::validate()
return false;
}
// Name valid? Ignore 'DisplayingInitialText' state.
// Name valid? Ignore 'DisplayingPlaceholderText' state.
bool nameValid = false;
switch (d->m_ui.nameLineEdit->state()) {
case FancyLineEdit::Invalid:
displayStatusMessage(Error, d->m_ui.nameLineEdit->errorMessage());
return false;
case FancyLineEdit::DisplayingInitialText:
case FancyLineEdit::DisplayingPlaceholderText:
break;
case FancyLineEdit::Valid:
nameValid = true;