diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-06-20 21:12:42 +0900 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-09 11:45:33 +0200 |
| commit | 9dcb94f5c3adf512cec6df6c79973b81e2fa2586 (patch) | |
| tree | 157ba0bc1e38e9b6a2031325b7630798e63c763d /src/svg/qsvghandler_p.h | |
| parent | 3ef761c179927bfc82562114ee0c654608737d2b (diff) | |
| download | qtsvg-9dcb94f5c3adf512cec6df6c79973b81e2fa2586.tar.gz | |
Make qtsvg compile with QT_NO_CSSPARSER
Change-Id: Iea4bb3433232e7350de8d68c504493cca3b34a3d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/svg/qsvghandler_p.h')
| -rw-r--r-- | src/svg/qsvghandler_p.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/svg/qsvghandler_p.h b/src/svg/qsvghandler_p.h index 8638191..d3c27cf 100644 --- a/src/svg/qsvghandler_p.h +++ b/src/svg/qsvghandler_p.h @@ -72,12 +72,16 @@ class QColor; class QSvgStyleSelector; class QXmlStreamReader; +#ifndef QT_NO_CSSPARSER + struct QSvgCssAttribute { QXmlStreamStringRef name; QXmlStreamStringRef value; }; +#endif + class QSvgHandler { public: @@ -115,15 +119,19 @@ public: void popColor(); QColor currentColor() const; +#ifndef QT_NO_CSSPARSER void setInStyle(bool b); bool inStyle() const; QSvgStyleSelector *selector() const; +#endif void setAnimPeriod(int start, int end); int animationDuration() const; +#ifndef QT_NO_CSSPARSER void parseCSStoXMLAttrs(QString css, QVector<QSvgCssAttribute> *attributes); +#endif inline QPen defaultPen() const { return m_defaultPen; } @@ -163,14 +171,14 @@ private: QStack<QColor> m_colorStack; QStack<int> m_colorTagCount; - bool m_inStyle; - - QSvgStyleSelector *m_selector; - int m_animEnd; QXmlStreamReader *const xml; +#ifndef QT_NO_CSSPARSER + bool m_inStyle; + QSvgStyleSelector *m_selector; QCss::Parser m_cssParser; +#endif void parse(); void resolveGradients(QSvgNode *node); |