diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 23:45:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 23:45:11 (GMT) |
| commit | 6594b23e79079f4d789a917209e35e894e4f8b76 (patch) | |
| tree | 06ea6f6968f172d226894a7025d8375a21096798 /src/svg/qsvgstructure_p.h | |
| parent | 2580b9b646586de0844d120d41f7240d75bc1a07 (diff) | |
| parent | 0e381f01782422ed9431da33b533bedb967b9739 (diff) | |
| download | Qt-6594b23e79079f4d789a917209e35e894e4f8b76.zip Qt-6594b23e79079f4d789a917209e35e894e4f8b76.tar.gz Qt-6594b23e79079f4d789a917209e35e894e4f8b76.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed bounds calculation in QtSvg.
Fixed vector-effect property output from QSvgGenerator.
Added text benchmarks from qtbench to tests/benchmarks
Diffstat (limited to 'src/svg/qsvgstructure_p.h')
| -rw-r--r-- | src/svg/qsvgstructure_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/svg/qsvgstructure_p.h b/src/svg/qsvgstructure_p.h index fd6eb0a..dd82fc0 100644 --- a/src/svg/qsvgstructure_p.h +++ b/src/svg/qsvgstructure_p.h @@ -74,14 +74,13 @@ public: ~QSvgStructureNode(); QSvgNode *scopeNode(const QString &id) const; void addChild(QSvgNode *child, const QString &id); - virtual QRectF bounds() const; + virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const; QSvgNode *previousSiblingNode(QSvgNode *n) const; QList<QSvgNode*> renderers() const { return m_renderers; } protected: QList<QSvgNode*> m_renderers; QHash<QString, QSvgNode*> m_scope; QList<QSvgStructureNode*> m_linkedScopes; - mutable QRectF m_bounds; }; class QSvgG : public QSvgStructureNode |