diff options
| author | Sami Merila <sami.merila@nokia.com> | 2009-12-16 10:21:14 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2009-12-16 10:21:14 (GMT) |
| commit | 989895e84806b88f0b1e0d75ce6dbf6c482357b6 (patch) | |
| tree | 95066131a2356d68479d2a4ad9fe719edf49e2fa /src/gui/widgets/qlinecontrol_p.h | |
| parent | a43868ca114562502618b4e9c3dd096c65c2e192 (diff) | |
| parent | 6e527912d719b0448b91eba1d6a99b9cbe58170a (diff) | |
| download | Qt-989895e84806b88f0b1e0d75ce6dbf6c482357b6.zip Qt-989895e84806b88f0b1e0d75ce6dbf6c482357b6.tar.gz Qt-989895e84806b88f0b1e0d75ce6dbf6c482357b6.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/gui/widgets/qlinecontrol_p.h')
| -rw-r--r-- | src/gui/widgets/qlinecontrol_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/widgets/qlinecontrol_p.h b/src/gui/widgets/qlinecontrol_p.h index 68898b6..f8e1a5d 100644 --- a/src/gui/widgets/qlinecontrol_p.h +++ b/src/gui/widgets/qlinecontrol_p.h @@ -174,8 +174,10 @@ public: void setMaxLength(int maxLength); int maxLength() const; +#ifndef QT_NO_VALIDATOR const QValidator *validator() const; void setValidator(const QValidator *); +#endif #ifndef QT_NO_COMPLETER QCompleter *completer() const; @@ -282,7 +284,9 @@ private: bool finishChange(int validateFromState = -1, bool update = false, bool edited = true); +#ifndef QT_NO_VALIDATOR QPointer<QValidator> m_validator; +#endif QPointer<QCompleter> m_completer; #ifndef QT_NO_COMPLETER bool advanceToEnabledItem(int dir); @@ -623,6 +627,7 @@ inline int QLineControl::maxLength() const return m_maxLength; } +#ifndef QT_NO_VALIDATOR inline const QValidator *QLineControl::validator() const { return m_validator; @@ -632,6 +637,7 @@ inline void QLineControl::setValidator(const QValidator *v) { m_validator = const_cast<QValidator*>(v); } +#endif #ifndef QT_NO_COMPLETER inline QCompleter *QLineControl::completer() const |