diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-02 02:56:07 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-02 02:56:07 (GMT) |
| commit | 666a475ea8c32eb5c49a53b29defc2c66c9cc5e3 (patch) | |
| tree | dfb4fe2d4308f02bf3b8d45331b5d93c1cabae01 /src/declarative/graphicsitems/qdeclarativetextinput_p.h | |
| parent | d39d01497640c3a0818d25036894495f8b597bdb (diff) | |
| parent | e93d11c733bb44208089a7488c6e7a176468d407 (diff) | |
| download | Qt-666a475ea8c32eb5c49a53b29defc2c66c9cc5e3.zip Qt-666a475ea8c32eb5c49a53b29defc2c66c9cc5e3.tar.gz Qt-666a475ea8c32eb5c49a53b29defc2c66c9cc5e3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextinput_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p.h index ba3f5b1..06f77e5 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h @@ -48,6 +48,8 @@ #include <QGraphicsSceneMouseEvent> #include <QIntValidator> +#ifndef QT_NO_LINEEDIT + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -263,4 +265,6 @@ QML_DECLARE_TYPE(QRegExpValidator) QT_END_HEADER +#endif // QT_NO_LINEEDIT + #endif // QDECLARATIVETEXTINPUT_H |