diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-12-15 12:44:11 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-12-15 12:44:20 +0100 |
| commit | 6812d1921161612788ac2f7c49decce77c8e0ccd (patch) | |
| tree | cec87e29e40c69d72ca5d7ca126c31b3eff10635 /src/quick/util/qquickvalidator.cpp | |
| parent | a1c6480360560ba73d9d4797ed970103c53ba7a4 (diff) | |
| parent | 0e80d28aa5892d6bbb4d0017b1bc9a33489f4176 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: I105afe41c9a71441a0eb39371e0f9622fa245643
Diffstat (limited to 'src/quick/util/qquickvalidator.cpp')
| -rw-r--r-- | src/quick/util/qquickvalidator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/util/qquickvalidator.cpp b/src/quick/util/qquickvalidator.cpp index 67cb6a6c05..015a376603 100644 --- a/src/quick/util/qquickvalidator.cpp +++ b/src/quick/util/qquickvalidator.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_VALIDATOR +#if QT_CONFIG(validator) /*! \qmltype IntValidator @@ -221,7 +221,7 @@ void QQuickDoubleValidator::resetLocaleName() By default, this property contains a regular expression with the pattern .* that matches any string. */ -#endif // QT_NO_VALIDATOR +#endif // validator QT_END_NAMESPACE |