diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-05-31 12:49:15 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2010-05-31 12:50:45 (GMT) |
| commit | cbff8db322bf8e99cb3e062cc47fd2fc0db81ac2 (patch) | |
| tree | 2bddbb7846e0efe128c26ab1765321c9418fbf4c /src/declarative/graphicsitems/qdeclarativetextinput_p.h | |
| parent | de904c51b140e11c801471871632d1d1b552e470 (diff) | |
| download | Qt-cbff8db322bf8e99cb3e062cc47fd2fc0db81ac2.zip Qt-cbff8db322bf8e99cb3e062cc47fd2fc0db81ac2.tar.gz Qt-cbff8db322bf8e99cb3e062cc47fd2fc0db81ac2.tar.bz2 | |
Fix QT_NO_VALIDATOR compilation.
Merge-request: 648
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextinput_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput_p.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p.h index 438293a..3dba844 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h @@ -79,7 +79,9 @@ class Q_DECLARATIVE_EXPORT QDeclarativeTextInput : public QDeclarativePaintedIte Q_PROPERTY(QString selectedText READ selectedText NOTIFY selectedTextChanged) Q_PROPERTY(int maximumLength READ maxLength WRITE setMaxLength NOTIFY maximumLengthChanged) +#ifndef QT_NO_VALIDATOR Q_PROPERTY(QValidator* validator READ validator WRITE setValidator NOTIFY validatorChanged) +#endif Q_PROPERTY(QString inputMask READ inputMask WRITE setInputMask NOTIFY inputMaskChanged) Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints) @@ -156,9 +158,10 @@ public: int maxLength() const; void setMaxLength(int ml); +#ifndef QT_NO_VALIDATOR QValidator * validator() const; void setValidator(QValidator* v); - +#endif QString inputMask() const; void setInputMask(const QString &im); @@ -248,10 +251,12 @@ private: QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeTextInput) +#ifndef QT_NO_VALIDATOR QML_DECLARE_TYPE(QValidator) QML_DECLARE_TYPE(QIntValidator) QML_DECLARE_TYPE(QDoubleValidator) QML_DECLARE_TYPE(QRegExpValidator) +#endif QT_END_HEADER |