diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2012-10-14 16:29:39 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-07 16:11:19 +0100 |
| commit | 59eb393cf57015a4dfea94617c863aafb096afa7 (patch) | |
| tree | 3cb977b8a857940f909ee52db05a3de92779dbca /src/gui/util/qvalidator.cpp | |
| parent | 79f0a29abf3b2947da7848c8501061fdf7e91b76 (diff) | |
Rename QRegularExpression-related feature defs to QT_NO_REGULAREXPRESSION
QRegExp and QRegularExpression are totally independent, therefore
using two different defines is the right thing to do.
Also, document the new define in qfeatures.{txt,h}.
Change-Id: Ice4826ea543f4b22f1cc27bf31ed6e043d0c43b0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'src/gui/util/qvalidator.cpp')
| -rw-r--r-- | src/gui/util/qvalidator.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp index 0d38ebaf14..645e7ceeda 100644 --- a/src/gui/util/qvalidator.cpp +++ b/src/gui/util/qvalidator.cpp @@ -502,9 +502,6 @@ void QIntValidator::setTop(int top) setRange(bottom(), top); } - -#ifndef QT_NO_REGEXP - /*! \internal */ @@ -521,6 +518,8 @@ QValidator::QValidator(QValidatorPrivate &d, QObject *parent) { } +#ifndef QT_NO_REGEXP + class QDoubleValidatorPrivate : public QValidatorPrivate { Q_DECLARE_PUBLIC(QDoubleValidator) @@ -907,7 +906,7 @@ void QRegExpValidator::setRegExp(const QRegExp& rx) #endif -#ifndef QT_NO_REGEXP +#ifndef QT_NO_REGULAREXPRESSION /*! \class QRegularExpressionValidator @@ -1058,7 +1057,7 @@ void QRegularExpressionValidatorPrivate::setRegularExpression(const QRegularExpr } } -#endif // QT_NO_REGEXP +#endif // QT_NO_REGULAREXPRESSION QT_END_NAMESPACE |