diff options
| author | Hatem ElKharashy <hatem.elkharashy@qt.io> | 2025-12-09 11:41:36 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2025-12-13 20:53:26 +0000 |
| commit | 71979b55c168886d66a1fa472956c1b60a082efa (patch) | |
| tree | 2a29d479fb982385930775d8e9eead518a437131 | |
| parent | 423c80c0d98c36d8460dc049c65aa3d4f9a9c72f (diff) | |
VectorImage: Fix compilation after Qt Svg changes6.11
Qt Svg has renamed QSvgTinyDocument to QSvgDocument. The name now
better reflects the implementation and the required changes in Vector
Image are done in this commit.
Change-Id: Ib558cc622b325575e24c9028d98134e4321416f7
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
(cherry picked from commit 7c256e2fd8d779e9c9b560181bfba9d9f2356d38)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/quickvectorimage/generator/qsvgvisitorimpl.cpp | 8 | ||||
| -rw-r--r-- | src/quickvectorimage/generator/qsvgvisitorimpl_p.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/quickvectorimage/generator/qsvgvisitorimpl.cpp b/src/quickvectorimage/generator/qsvgvisitorimpl.cpp index 3193bf05d4..dceff04da9 100644 --- a/src/quickvectorimage/generator/qsvgvisitorimpl.cpp +++ b/src/quickvectorimage/generator/qsvgvisitorimpl.cpp @@ -296,7 +296,7 @@ bool QSvgVisitorImpl::traverse() if (m_assumeTrustedSource) options.setFlag(QtSvg::AssumeTrustedSource); - auto *doc = QSvgTinyDocument::load(m_svgFileName, options); + auto *doc = QSvgDocument::load(m_svgFileName, options); if (!doc) { qCDebug(lcQuickVectorImage) << "Not a valid Svg File : " << m_svgFileName; return false; @@ -1457,7 +1457,7 @@ QString QSvgVisitorImpl::nextNodeId() const return QStringLiteral("_qt_node%1").arg(m_nodeIdCounter++); } -bool QSvgVisitorImpl::visitDocumentNodeStart(const QSvgTinyDocument *node) +bool QSvgVisitorImpl::visitDocumentNodeStart(const QSvgDocument *node) { Q_ASSERT(m_defsLevel == 0); handleBaseNodeSetup(node); @@ -1466,7 +1466,7 @@ bool QSvgVisitorImpl::visitDocumentNodeStart(const QSvgTinyDocument *node) fillCommonNodeInfo(node, info); fillAnimationInfo(node, info); - const QSvgTinyDocument *doc = static_cast<const QSvgTinyDocument *>(node); + const QSvgDocument *doc = static_cast<const QSvgDocument *>(node); info.size = doc->size(); info.viewBox = doc->viewBox(); info.isPathContainer = isPathContainer(node); @@ -1476,7 +1476,7 @@ bool QSvgVisitorImpl::visitDocumentNodeStart(const QSvgTinyDocument *node) return m_generator->generateRootNode(info); } -void QSvgVisitorImpl::visitDocumentNodeEnd(const QSvgTinyDocument *node) +void QSvgVisitorImpl::visitDocumentNodeEnd(const QSvgDocument *node) { handleBaseNodeEnd(node); qCDebug(lcQuickVectorImage) << "REVERT" << node->nodeId() << node->type() << (styleResolver->painter().pen().style() != Qt::NoPen) diff --git a/src/quickvectorimage/generator/qsvgvisitorimpl_p.h b/src/quickvectorimage/generator/qsvgvisitorimpl_p.h index 9e907ac04c..a537bed03f 100644 --- a/src/quickvectorimage/generator/qsvgvisitorimpl_p.h +++ b/src/quickvectorimage/generator/qsvgvisitorimpl_p.h @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE class QTextStream; -class QSvgTinyDocument; +class QSvgDocument; class QSvgFeFilterPrimitive; class QString; class QQuickItem; @@ -55,8 +55,8 @@ protected: bool visitMaskNodeStart(const QSvgMask *node) override; void visitMaskNodeEnd(const QSvgMask *node) override; - bool visitDocumentNodeStart(const QSvgTinyDocument *node) override; - void visitDocumentNodeEnd(const QSvgTinyDocument *node) override; + bool visitDocumentNodeStart(const QSvgDocument *node) override; + void visitDocumentNodeEnd(const QSvgDocument *node) override; bool visitSwitchNodeStart(const QSvgSwitch *node) override; void visitSwitchNodeEnd(const QSvgSwitch *node) override; |