1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some leftovers of QRegExpValidator

Browse Source 
Amends dee55af0a5359bb3b57a89cf3065ffca9d8506da

Change-Id: I59c02c6c289028abb86cdab1b2f2b3efdcea7821
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
This commit is contained in:
Lars Knoll 2020-03-18 12:18:26 +01:00
parent 907652e1ed
commit 3151c510e8
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/dialogs/qcolordialog.cpp
View File

@ -1314,10 +1314,6 @@ QColorShower::QColorShower(QColorDialog *parent)
QRegularExpression regExp(QStringLiteral("#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})")); QRegularExpression regExp(QStringLiteral("#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})"));
QRegularExpressionValidator *validator = new QRegularExpressionValidator(regExp, this); QRegularExpressionValidator *validator = new QRegularExpressionValidator(regExp, this);
htEd->setValidator(validator); htEd->setValidator(validator);
#elif !defined(QT_NO_REGEXP)
QRegExp regExp(QStringLiteral("#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})"));
QRegExpValidator *validator = new QRegExpValidator(regExp, this);
htEd->setValidator(validator);
#else #else
htEd->setReadOnly(true); htEd->setReadOnly(true);
#endif #endif

2
src/widgets/widgets/qlineedit.cpp
View File

@ -609,7 +609,7 @@ const QValidator * QLineEdit::validator() const
The initial setting is to have no input validator (i.e. any input The initial setting is to have no input validator (i.e. any input
is accepted up to maxLength()). is accepted up to maxLength()).
\sa validator(), hasAcceptableInput(), QIntValidator, QDoubleValidator, QRegExpValidator \sa validator(), hasAcceptableInput(), QIntValidator, QDoubleValidator, QRegularExpressionValidator
*/ */
void QLineEdit::setValidator(const QValidator *v) void QLineEdit::setValidator(const QValidator *v)