diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-19 07:41:57 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-29 16:00:09 (GMT) |
| commit | 7c1122b79df61668525b63670c03c5da7e44ac9c (patch) | |
| tree | 2bc33244925d9e2f8249631676ded6b3f54e1d52 /src | |
| parent | 5c4130a509248e897d52e4980cc8d58f0940d76c (diff) | |
| download | Qt-7c1122b79df61668525b63670c03c5da7e44ac9c.zip Qt-7c1122b79df61668525b63670c03c5da7e44ac9c.tar.gz Qt-7c1122b79df61668525b63670c03c5da7e44ac9c.tar.bz2 | |
Fix QT_NO_XMLSTREAMREADER
Reviewed-by: tom
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/xml/qxmlstream.g | 4 | ||||
| -rw-r--r-- | src/corelib/xml/qxmlstream_p.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/xml/qxmlstream.g b/src/corelib/xml/qxmlstream.g index 3bf0e7d..6c0c0cf 100644 --- a/src/corelib/xml/qxmlstream.g +++ b/src/corelib/xml/qxmlstream.g @@ -243,7 +243,7 @@ public: class QXmlStreamEntityResolver; - +#ifndef QT_NO_XMLSTREAMREADER class QXmlStreamReaderPrivate : public QXmlStreamReader_Table, public QXmlStreamPrivateTagStack{ QXmlStreamReader *q_ptr; Q_DECLARE_PUBLIC(QXmlStreamReader) @@ -1840,4 +1840,6 @@ nmtoken ::= COLON; } return false; } +#endif //QT_NO_XMLSTREAMREADER.xml + ./ diff --git a/src/corelib/xml/qxmlstream_p.h b/src/corelib/xml/qxmlstream_p.h index ed65409..eee3a13 100644 --- a/src/corelib/xml/qxmlstream_p.h +++ b/src/corelib/xml/qxmlstream_p.h @@ -736,9 +736,9 @@ public: } }; - class QXmlStreamEntityResolver; +#ifndef QT_NO_XMLSTREAMREADER class QXmlStreamReaderPrivate : public QXmlStreamReader_Table, public QXmlStreamPrivateTagStack{ QXmlStreamReader *q_ptr; Q_DECLARE_PUBLIC(QXmlStreamReader) @@ -1959,5 +1959,6 @@ bool QXmlStreamReaderPrivate::parse() return false; } +#endif //QT_NO_XMLSTREAMREADER #endif // QXMLSTREAM_P_H |