15 files changed, 72 insertions, 72 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5eea32eeee..330dff2eda 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,7 +57,7 @@ if(TARGET Qt::Gui AND TARGET Qt::qsb AND QT_FEATURE_qml_animation)
     endif()
 
     if(TARGET Qt::Svg)
-        add_subdirectory(quickvectorgraphics)
+        add_subdirectory(quickvectorimage)
     endif()
 
     if(TARGET Qt::Widgets)
diff --git a/src/quickvectorgraphics/CMakeLists.txt b/src/quickvectorimage/CMakeLists.txt
index 287a6c1b9d..2580061e48 100644
--- a/src/quickvectorgraphics/CMakeLists.txt
+++ b/src/quickvectorimage/CMakeLists.txt
@@ -5,7 +5,7 @@
 ## QuickVectorGraphics Module:
 #####################################################################
 
-qt_internal_add_module(QuickVectorGraphicsGeneratorPrivate
+qt_internal_add_module(QuickVectorImageGeneratorPrivate
     INTERNAL_MODULE
     SOURCES
         generator/qsvgvisitorimpl_p.h generator/qsvgvisitorimpl.cpp
@@ -14,7 +14,7 @@ qt_internal_add_module(QuickVectorGraphicsGeneratorPrivate
         generator/qquickqmlgenerator_p.h generator/qquickqmlgenerator.cpp
         generator/qquicknodeinfo_p.h
         generator/utils_p.h
-        qquickvectorgraphicsglobal_p.h
+        qquickvectorimageglobal_p.h
     LIBRARIES
         Qt::Core
         Qt::QuickPrivate
diff --git a/src/quickvectorgraphics/generator/qquickgenerator.cpp b/src/quickvectorimage/generator/qquickgenerator.cpp
index 4d9600dbe5..fdc7e84387 100644
--- a/src/quickvectorgraphics/generator/qquickgenerator.cpp
+++ b/src/quickvectorimage/generator/qquickgenerator.cpp
@@ -11,13 +11,13 @@
 #include <private/qquickitem_p.h>
 #include <private/qquickimagebase_p_p.h>
 
-#include<QtCore/qloggingcategory.h>
+#include <QtCore/qloggingcategory.h>
 
 QT_BEGIN_NAMESPACE
 
 Q_LOGGING_CATEGORY(lcQuickVectorGraphics, "qt.quick.vectorgraphics", QtWarningMsg)
 
-QQuickGenerator::QQuickGenerator(const QString fileName, QQuickVectorGraphics::GeneratorFlags flags)
+QQuickGenerator::QQuickGenerator(const QString fileName, QQuickVectorImageGenerator::GeneratorFlags flags)
     : m_flags(flags)
     , m_fileName(fileName)
     , m_loader(nullptr)
@@ -29,12 +29,12 @@ QQuickGenerator::~QQuickGenerator()
     delete m_loader;
 }
 
-void QQuickGenerator::setGeneratorFlags(QQuickVectorGraphics::GeneratorFlags flags)
+void QQuickGenerator::setGeneratorFlags(QQuickVectorImageGenerator::GeneratorFlags flags)
 {
     m_flags = flags;
 }
 
-QQuickVectorGraphics::GeneratorFlags QQuickGenerator::generatorFlags()
+QQuickVectorImageGenerator::GeneratorFlags QQuickGenerator::generatorFlags()
 {
     return m_flags;
 }
@@ -50,7 +50,7 @@ void QQuickGenerator::optimizePaths(const PathNodeInfo &info)
     QPainterPath pathCopy = info.painterPath;
     pathCopy.setFillRule(info.fillRule);
 
-    if (m_flags.testFlag(QQuickVectorGraphics::GeneratorFlag::OptimizePaths)) {
+    if (m_flags.testFlag(QQuickVectorImageGenerator::GeneratorFlag::OptimizePaths)) {
         QQuadPath strokePath = QQuadPath::fromPainterPath(pathCopy);
         bool fillPathNeededClose;
         QQuadPath fillPath = strokePath.subPathsClosed(&fillPathNeededClose);
@@ -58,14 +58,14 @@ void QQuickGenerator::optimizePaths(const PathNodeInfo &info)
         fillPath.addCurvatureData();
         QSGCurveProcessor::solveOverlaps(fillPath);
         const bool compatibleStrokeAndFill = !fillPathNeededClose && !intersectionsFound;
-        if (compatibleStrokeAndFill || m_flags.testFlag(QQuickVectorGraphics::GeneratorFlag::OutlineStrokeMode)) {
-            outputShapePath(info, nullptr, &fillPath, QQuickVectorGraphics::FillAndStroke, pathCopy.boundingRect());
+        if (compatibleStrokeAndFill || m_flags.testFlag(QQuickVectorImageGenerator::GeneratorFlag::OutlineStrokeMode)) {
+            outputShapePath(info, nullptr, &fillPath, QQuickVectorImageGenerator::FillAndStroke, pathCopy.boundingRect());
         } else {
-            outputShapePath(info, nullptr, &fillPath, QQuickVectorGraphics::FillPath, pathCopy.boundingRect());
-            outputShapePath(info, nullptr, &strokePath, QQuickVectorGraphics::StrokePath, pathCopy.boundingRect());
+            outputShapePath(info, nullptr, &fillPath, QQuickVectorImageGenerator::FillPath, pathCopy.boundingRect());
+            outputShapePath(info, nullptr, &strokePath, QQuickVectorImageGenerator::StrokePath, pathCopy.boundingRect());
         }
     } else {
-        outputShapePath(info, &pathCopy, nullptr, QQuickVectorGraphics::FillAndStroke, pathCopy.boundingRect());
+        outputShapePath(info, &pathCopy, nullptr, QQuickVectorImageGenerator::FillAndStroke, pathCopy.boundingRect());
     }
 }
 
diff --git a/src/quickvectorgraphics/generator/qquickgenerator_p.h b/src/quickvectorimage/generator/qquickgenerator_p.h
index 5d5a14b8a5..114f241cb5 100644
--- a/src/quickvectorgraphics/generator/qquickgenerator_p.h
+++ b/src/quickvectorimage/generator/qquickgenerator_p.h
@@ -15,7 +15,7 @@
 // We mean it.
 //
 
-#include <private/qquickvectorgraphicsglobal_p.h>
+#include <private/qquickvectorimageglobal_p.h>
 #include <QtCore/qstring.h>
 
 QT_BEGIN_NAMESPACE
@@ -35,14 +35,14 @@ struct PathNodeInfo;
 struct TextNodeInfo;
 struct StructureNodeInfo;
 
-class Q_QUICKVECTORGRAPHICSGENERATOR_EXPORT QQuickGenerator
+class Q_QUICKVECTORIMAGEGENERATOR_EXPORT QQuickGenerator
 {
 public:
-    QQuickGenerator(const QString fileName, QQuickVectorGraphics::GeneratorFlags flags);
+    QQuickGenerator(const QString fileName, QQuickVectorImageGenerator::GeneratorFlags flags);
     virtual ~QQuickGenerator();
 
-    void setGeneratorFlags(QQuickVectorGraphics::GeneratorFlags flags);
-    QQuickVectorGraphics::GeneratorFlags generatorFlags();
+    void setGeneratorFlags(QQuickVectorImageGenerator::GeneratorFlags flags);
+    QQuickVectorImageGenerator::GeneratorFlags generatorFlags();
 
     void generate();
 
@@ -55,11 +55,11 @@ protected:
     virtual void generateTextNode(const TextNodeInfo &info) = 0;
     virtual void generateStructureNode(const StructureNodeInfo &info) = 0;
     virtual void generateRootNode(const StructureNodeInfo &info) = 0;
-    virtual void outputShapePath(const PathNodeInfo &info, const QPainterPath *path, const QQuadPath *quadPath, QQuickVectorGraphics::PathSelector pathSelector, const QRectF &boundingRect) = 0;
+    virtual void outputShapePath(const PathNodeInfo &info, const QPainterPath *path, const QQuadPath *quadPath, QQuickVectorImageGenerator::PathSelector pathSelector, const QRectF &boundingRect) = 0;
     void optimizePaths(const PathNodeInfo &info);
 
 protected:
-    QQuickVectorGraphics::GeneratorFlags m_flags;
+    QQuickVectorImageGenerator::GeneratorFlags m_flags;
 
 private:
     QString m_fileName;
diff --git a/src/quickvectorgraphics/generator/qquickitemgenerator.cpp b/src/quickvectorimage/generator/qquickitemgenerator.cpp
index 619804d697..2deb719c5a 100644
--- a/src/quickvectorgraphics/generator/qquickitemgenerator.cpp
+++ b/src/quickvectorimage/generator/qquickitemgenerator.cpp
@@ -11,13 +11,13 @@
 #include <private/qquickitem_p.h>
 #include <private/qquickimagebase_p_p.h>
 
-#include<QtCore/qloggingcategory.h>
+#include <QtCore/qloggingcategory.h>
 
 QT_BEGIN_NAMESPACE
 
 Q_DECLARE_LOGGING_CATEGORY(lcQuickVectorGraphics)
 
-QQuickItemGenerator::QQuickItemGenerator(const QString fileName, QQuickVectorGraphics::GeneratorFlags flags, QQuickItem *parentItem)
+QQuickItemGenerator::QQuickItemGenerator(const QString fileName, QQuickVectorImageGenerator::GeneratorFlags flags, QQuickItem *parentItem)
     :QQuickGenerator(fileName, flags)
 {
     Q_ASSERT(parentItem);
@@ -94,7 +94,7 @@ void QQuickItemGenerator::generatePath(const PathNodeInfo &info)
         optimizePaths(info);
     } else {
         auto *shapeItem = new QQuickShape;
-        if (m_flags.testFlag(QQuickVectorGraphics::GeneratorFlag::CurveRenderer))
+        if (m_flags.testFlag(QQuickVectorImageGenerator::GeneratorFlag::CurveRenderer))
             shapeItem->setPreferredRendererType(QQuickShape::CurveRenderer);
         shapeItem->setContainsMode(QQuickShape::ContainsMode::FillContains); // TODO: configurable?
         addCurrentItem(shapeItem, info);
@@ -112,18 +112,18 @@ void QQuickItemGenerator::generatePath(const PathNodeInfo &info)
     }
 }
 
-void QQuickItemGenerator::outputShapePath(const PathNodeInfo &info, const QPainterPath *painterPath, const QQuadPath *quadPath, QQuickVectorGraphics::PathSelector pathSelector, const QRectF &boundingRect)
+void QQuickItemGenerator::outputShapePath(const PathNodeInfo &info, const QPainterPath *painterPath, const QQuadPath *quadPath, QQuickVectorImageGenerator::PathSelector pathSelector, const QRectF &boundingRect)
 {
     Q_UNUSED(pathSelector)
     Q_ASSERT(painterPath || quadPath);
 
     QString penName = info.strokeColor;
     const bool noPen = penName.isEmpty() || penName == u"transparent";
-    if (pathSelector == QQuickVectorGraphics::StrokePath && noPen)
+    if (pathSelector == QQuickVectorImageGenerator::StrokePath && noPen)
         return;
 
     const bool noFill = !info.grad && info.fillColor == u"transparent";
-    if (pathSelector == QQuickVectorGraphics::FillPath && noFill)
+    if (pathSelector == QQuickVectorImageGenerator::FillPath && noFill)
         return;
 
     QQuickShapePath::FillRule fillRule = QQuickShapePath::FillRule(painterPath ? painterPath->fillRule() : quadPath->fillRule());
@@ -136,7 +136,7 @@ void QQuickItemGenerator::outputShapePath(const PathNodeInfo &info, const QPaint
         shapePath->setObjectName(QStringLiteral("svg_path:") + info.nodeId);
     }
 
-    if (noPen || !(pathSelector & QQuickVectorGraphics::StrokePath)) {
+    if (noPen || !(pathSelector & QQuickVectorImageGenerator::StrokePath)) {
         shapePath->setStrokeColor(Qt::transparent);
     } else {
         shapePath->setStrokeColor(QColor::fromString(penName));
@@ -145,7 +145,7 @@ void QQuickItemGenerator::outputShapePath(const PathNodeInfo &info, const QPaint
 
     shapePath->setCapStyle(QQuickShapePath::CapStyle(info.capStyle));
 
-    if (!(pathSelector & QQuickVectorGraphics::FillPath))
+    if (!(pathSelector & QQuickVectorImageGenerator::FillPath))
         shapePath->setFillColor(Qt::transparent);
     else if (auto *grad = info.grad)
         generateGradient(grad, shapePath, boundingRect);
@@ -154,7 +154,7 @@ void QQuickItemGenerator::outputShapePath(const PathNodeInfo &info, const QPaint
 
     shapePath->setFillRule(fillRule);
 
-    QString svgPathString = painterPath ? QQuickVectorGraphics::Utils::toSvgString(*painterPath) : QQuickVectorGraphics::Utils::toSvgString(*quadPath);
+    QString svgPathString = painterPath ? QQuickVectorImageGenerator::Utils::toSvgString(*painterPath) : QQuickVectorImageGenerator::Utils::toSvgString(*quadPath);
 
     auto *pathSvg = new QQuickPathSvg;
     pathSvg->setPath(svgPathString);
@@ -187,7 +187,7 @@ void QQuickItemGenerator::generateGradient(const QGradient *grad, QQuickShapePat
         auto *linGrad = static_cast<const QLinearGradient *>(grad);
 
         QRectF gradRect(linGrad->start(), linGrad->finalStop());
-        QRectF logRect = linGrad->coordinateMode() == QGradient::LogicalMode ? gradRect : QQuickVectorGraphics::Utils::mapToQtLogicalMode(gradRect, boundingRect);
+        QRectF logRect = linGrad->coordinateMode() == QGradient::LogicalMode ? gradRect : QQuickVectorImageGenerator::Utils::mapToQtLogicalMode(gradRect, boundingRect);
 
             auto *quickGrad = new QQuickShapeLinearGradient(shapePath);
 
@@ -279,12 +279,12 @@ void QQuickItemGenerator::generateStructureNode(const StructureNodeInfo &info)
         if (!info.forceSeparatePaths && info.isPathContainer) {
             m_inShapeItem = true;
             auto *shapeItem = new QQuickShape;
-            if (m_flags.testFlag(QQuickVectorGraphics::GeneratorFlag::CurveRenderer))
+            if (m_flags.testFlag(QQuickVectorImageGenerator::GeneratorFlag::CurveRenderer))
                 shapeItem->setPreferredRendererType(QQuickShape::CurveRenderer);
             m_parentShapeItem = shapeItem;
             addCurrentItem(shapeItem, info);
         } else {
-            QQuickItem *item = !info.viewBox.isEmpty() ? new QQuickVectorGraphics::Utils::ViewBoxItem(info.viewBox) : new QQuickItem;
+            QQuickItem *item = !info.viewBox.isEmpty() ? new QQuickVectorImageGenerator::Utils::ViewBoxItem(info.viewBox) : new QQuickItem;
             addCurrentItem(item, info);
         }
 
@@ -299,7 +299,7 @@ void QQuickItemGenerator::generateStructureNode(const StructureNodeInfo &info)
 void QQuickItemGenerator::generateRootNode(const StructureNodeInfo &info)
 {
     if (info.stage == StructureNodeInfo::StructureNodeStage::Start) {
-        QQuickItem *item = !info.viewBox.isEmpty() ? new QQuickVectorGraphics::Utils::ViewBoxItem(info.viewBox) : new QQuickItem;
+        QQuickItem *item = !info.viewBox.isEmpty() ? new QQuickVectorImageGenerator::Utils::ViewBoxItem(info.viewBox) : new QQuickItem;
         addCurrentItem(item, info);
         if (info.size.width() > 0)
             m_parentItem->setImplicitWidth(info.size.width());
diff --git a/src/quickvectorgraphics/generator/qquickitemgenerator_p.h b/src/quickvectorimage/generator/qquickitemgenerator_p.h
index c2e7b29c99..99236141af 100644
--- a/src/quickvectorgraphics/generator/qquickitemgenerator_p.h
+++ b/src/quickvectorimage/generator/qquickitemgenerator_p.h
@@ -20,10 +20,10 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKVECTORGRAPHICSGENERATOR_EXPORT QQuickItemGenerator : public QQuickGenerator
+class Q_QUICKVECTORIMAGEGENERATOR_EXPORT QQuickItemGenerator : public QQuickGenerator
 {
 public:
-    QQuickItemGenerator(const QString fileName, QQuickVectorGraphics::GeneratorFlags flags, QQuickItem *parentItem);
+    QQuickItemGenerator(const QString fileName, QQuickVectorImageGenerator::GeneratorFlags flags, QQuickItem *parentItem);
     ~QQuickItemGenerator();
 
 protected:
@@ -35,7 +35,7 @@ protected:
     void generateTextNode(const TextNodeInfo &info) override;
     void generateStructureNode(const StructureNodeInfo &info) override;
     void generateRootNode(const StructureNodeInfo &info) override;
-    void outputShapePath(const PathNodeInfo &info, const QPainterPath *path, const QQuadPath *quadPath, QQuickVectorGraphics::PathSelector pathSelector, const QRectF &boundingRect) override;
+    void outputShapePath(const PathNodeInfo &info, const QPainterPath *path, const QQuadPath *quadPath, QQuickVectorImageGenerator::PathSelector pathSelector, const QRectF &boundingRect) override;
 
 private:
     void generateGradient(const QGradient *grad, QQuickShapePath *shapePath, const QRectF &boundingRect);
diff --git a/src/quickvectorgraphics/generator/qquicknodeinfo_p.h b/src/quickvectorimage/generator/qquicknodeinfo_p.h
index 23684fe1c5..23684fe1c5 100644
--- a/src/quickvectorgraphics/generator/qquicknodeinfo_p.h
+++ b/src/quickvectorimage/generator/qquicknodeinfo_p.h
diff --git a/src/quickvectorgraphics/generator/qquickqmlgenerator.cpp b/src/quickvectorimage/generator/qquickqmlgenerator.cpp
index ce611ccda1..eaf2a4dd6f 100644
--- a/src/quickvectorgraphics/generator/qquickqmlgenerator.cpp
+++ b/src/quickvectorimage/generator/qquickqmlgenerator.cpp
@@ -11,7 +11,7 @@
 #include <private/qquickitem_p.h>
 #include <private/qquickimagebase_p_p.h>
 
-#include<QtCore/qloggingcategory.h>
+#include <QtCore/qloggingcategory.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -48,7 +48,7 @@ private:
     QByteArray m_output;
 };
 
-QQuickQmlGenerator::QQuickQmlGenerator(const QString fileName, QQuickVectorGraphics::GeneratorFlags flags, const QString &outFileName)
+QQuickQmlGenerator::QQuickQmlGenerator(const QString fileName, QQuickVectorImageGenerator::GeneratorFlags flags, const QString &outFileName)
     : QQuickGenerator(fileName, flags)
     , outputFileName(outFileName)
 {
@@ -168,7 +168,7 @@ void QQuickQmlGenerator::generatePath(const PathNodeInfo &info)
         generateNodeBase(info);
 
         m_indentLevel++;
-        if (m_flags.testFlag(QQuickVectorGraphics::GeneratorFlag::CurveRenderer))
+        if (m_flags.testFlag(QQuickVectorImageGenerator::GeneratorFlag::CurveRenderer))
             stream() << "preferredRendererType: Shape.CurveRenderer";
         optimizePaths(info);
         //qCDebug(lcQuickVectorGraphics) << *node->qpath();
@@ -186,7 +186,7 @@ void QQuickQmlGenerator::generateGradient(const QGradient *grad, const QRectF &b
         m_indentLevel++;
 
         QRectF gradRect(linGrad->start(), linGrad->finalStop());
-        QRectF logRect = linGrad->coordinateMode() == QGradient::LogicalMode ? gradRect : QQuickVectorGraphics::Utils::mapToQtLogicalMode(gradRect, boundingRect);
+        QRectF logRect = linGrad->coordinateMode() == QGradient::LogicalMode ? gradRect : QQuickVectorImageGenerator::Utils::mapToQtLogicalMode(gradRect, boundingRect);
 
         stream() << "x1: " << logRect.left();
         stream() << "y1: " << logRect.top();
@@ -215,18 +215,18 @@ void QQuickQmlGenerator::generateGradient(const QGradient *grad, const QRectF &b
     }
 }
 
-void QQuickQmlGenerator::outputShapePath(const PathNodeInfo &info, const QPainterPath *painterPath, const QQuadPath *quadPath, QQuickVectorGraphics::PathSelector pathSelector, const QRectF &boundingRect)
+void QQuickQmlGenerator::outputShapePath(const PathNodeInfo &info, const QPainterPath *painterPath, const QQuadPath *quadPath, QQuickVectorImageGenerator::PathSelector pathSelector, const QRectF &boundingRect)
 {
     Q_UNUSED(pathSelector)
     Q_ASSERT(painterPath || quadPath);
 
     QString penName = info.strokeColor;
     const bool noPen = penName.isEmpty() || penName == u"transparent";
-    if (pathSelector == QQuickVectorGraphics::StrokePath && noPen)
+    if (pathSelector == QQuickVectorImageGenerator::StrokePath && noPen)
         return;
 
     const bool noFill = !info.grad && info.fillColor == u"transparent";
-    if (pathSelector == QQuickVectorGraphics::FillPath && noFill)
+    if (pathSelector == QQuickVectorImageGenerator::FillPath && noFill)
         return;
 
     auto fillRule = QQuickShapePath::FillRule(painterPath ? painterPath->fillRule() : quadPath->fillRule());
@@ -234,19 +234,19 @@ void QQuickQmlGenerator::outputShapePath(const PathNodeInfo &info, const QPainte
     m_indentLevel++;
     if (!info.nodeId.isEmpty()) {
         switch (pathSelector) {
-        case QQuickVectorGraphics::FillPath:
+        case QQuickVectorImageGenerator::FillPath:
             stream() << "objectName: \"svg_fill_path:" << info.nodeId << "\"";
             break;
-        case QQuickVectorGraphics::StrokePath:
+        case QQuickVectorImageGenerator::StrokePath:
             stream() << "objectName: \"svg_stroke_path:" << info.nodeId << "\"";
             break;
-        case QQuickVectorGraphics::FillAndStroke:
+        case QQuickVectorImageGenerator::FillAndStroke:
             stream() << "objectName: \"svg_path:" << info.nodeId << "\"";
             break;
         }
     }
 
-    if (noPen || !(pathSelector & QQuickVectorGraphics::StrokePath)) {
+    if (noPen || !(pathSelector & QQuickVectorImageGenerator::StrokePath)) {
         stream() << "strokeColor: \"transparent\"";
     } else {
         stream() << "strokeColor: \"" << penName << "\"";
@@ -255,7 +255,7 @@ void QQuickQmlGenerator::outputShapePath(const PathNodeInfo &info, const QPainte
     if (info.capStyle == Qt::FlatCap)
         stream() << "capStyle: ShapePath.FlatCap"; //### TODO Add the rest of the styles, as well as join styles etc.
 
-    if (!(pathSelector & QQuickVectorGraphics::FillPath)) {
+    if (!(pathSelector & QQuickVectorImageGenerator::FillPath)) {
         stream() << "fillColor: \"transparent\"";
     } else if (auto *grad = info.grad) {
         generateGradient(grad, boundingRect);
@@ -270,12 +270,12 @@ void QQuickQmlGenerator::outputShapePath(const PathNodeInfo &info, const QPainte
 
     QString hintStr;
     if (quadPath)
-        hintStr = QQuickVectorGraphics::Utils::pathHintString(*quadPath);
+        hintStr = QQuickVectorImageGenerator::Utils::pathHintString(*quadPath);
     if (!hintStr.isEmpty())
         stream() << hintStr;
 
 
-    QString svgPathString = painterPath ? QQuickVectorGraphics::Utils::toSvgString(*painterPath) : QQuickVectorGraphics::Utils::toSvgString(*quadPath);
+    QString svgPathString = painterPath ? QQuickVectorImageGenerator::Utils::toSvgString(*painterPath) : QQuickVectorImageGenerator::Utils::toSvgString(*quadPath);
     stream() <<   "PathSvg { path: \"" << svgPathString << "\" }";
 
     m_indentLevel--;
@@ -354,7 +354,7 @@ void QQuickQmlGenerator::generateStructureNode(const StructureNodeInfo &info)
         if (!info.forceSeparatePaths && info.isPathContainer) {
             stream() << shapeName() <<" {";
             m_indentLevel++;
-            if (m_flags.testFlag(QQuickVectorGraphics::GeneratorFlag::CurveRenderer))
+            if (m_flags.testFlag(QQuickVectorImageGenerator::GeneratorFlag::CurveRenderer))
                 stream() << "preferredRendererType: Shape.CurveRenderer";
             m_indentLevel--;
 
diff --git a/src/quickvectorgraphics/generator/qquickqmlgenerator_p.h b/src/quickvectorimage/generator/qquickqmlgenerator_p.h
index 486147d82c..c0013d80d1 100644
--- a/src/quickvectorgraphics/generator/qquickqmlgenerator_p.h
+++ b/src/quickvectorimage/generator/qquickqmlgenerator_p.h
@@ -23,10 +23,10 @@ QT_BEGIN_NAMESPACE
 
 class GeneratorStream;
 
-class Q_QUICKVECTORGRAPHICSGENERATOR_EXPORT QQuickQmlGenerator : public QQuickGenerator
+class Q_QUICKVECTORIMAGEGENERATOR_EXPORT QQuickQmlGenerator : public QQuickGenerator
 {
 public:
-    QQuickQmlGenerator(const QString fileName, QQuickVectorGraphics::GeneratorFlags flags, const QString &outFileName);
+    QQuickQmlGenerator(const QString fileName, QQuickVectorImageGenerator::GeneratorFlags flags, const QString &outFileName);
     ~QQuickQmlGenerator();
 
     void setShapeTypeName(const QString &name);
@@ -44,7 +44,7 @@ protected:
     void generateTextNode(const TextNodeInfo &info) override;
     void generateStructureNode(const StructureNodeInfo &info) override;
     void generateRootNode(const StructureNodeInfo &info) override;
-    void outputShapePath(const PathNodeInfo &info, const QPainterPath *path, const QQuadPath *quadPath, QQuickVectorGraphics::PathSelector pathSelector, const QRectF &boundingRect) override;
+    void outputShapePath(const PathNodeInfo &info, const QPainterPath *path, const QQuadPath *quadPath, QQuickVectorImageGenerator::PathSelector pathSelector, const QRectF &boundingRect) override;
 
 private:
     void generateGradient(const QGradient *grad, const QRectF &boundingRect);
diff --git a/src/quickvectorgraphics/generator/qsvgvisitorimpl.cpp b/src/quickvectorimage/generator/qsvgvisitorimpl.cpp
index 64d3565da0..ccc597f141 100644
--- a/src/quickvectorgraphics/generator/qsvgvisitorimpl.cpp
+++ b/src/quickvectorimage/generator/qsvgvisitorimpl.cpp
@@ -24,7 +24,7 @@
 #include <private/qquadpath_p.h>
 
 #include "utils_p.h"
-#include<QtCore/qloggingcategory.h>
+#include <QtCore/qloggingcategory.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -251,13 +251,13 @@ void QSvgVisitorImpl::visitLineNode(const QSvgLine *node)
 
 void QSvgVisitorImpl::visitPolygonNode(const QSvgPolygon *node)
 {
-    QPainterPath p = QQuickVectorGraphics::Utils::polygonToPath(node->polygon(), true);
+    QPainterPath p = QQuickVectorImageGenerator::Utils::polygonToPath(node->polygon(), true);
     handlePathNode(node, p);
 }
 
 void QSvgVisitorImpl::visitPolylineNode(const QSvgPolyline *node)
 {
-    QPainterPath p = QQuickVectorGraphics::Utils::polygonToPath(node->polygon(), false);
+    QPainterPath p = QQuickVectorImageGenerator::Utils::polygonToPath(node->polygon(), false);
     handlePathNode(node, p, Qt::FlatCap);
 }
 
diff --git a/src/quickvectorgraphics/generator/qsvgvisitorimpl_p.h b/src/quickvectorimage/generator/qsvgvisitorimpl_p.h
index a025cead1d..a025cead1d 100644
--- a/src/quickvectorgraphics/generator/qsvgvisitorimpl_p.h
+++ b/src/quickvectorimage/generator/qsvgvisitorimpl_p.h
diff --git a/src/quickvectorgraphics/generator/utils_p.h b/src/quickvectorimage/generator/utils_p.h
index 60f8e6f252..8d7c0eab9d 100644
--- a/src/quickvectorgraphics/generator/utils_p.h
+++ b/src/quickvectorimage/generator/utils_p.h
@@ -24,7 +24,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace QQuickVectorGraphics::Utils
+namespace QQuickVectorImageGenerator::Utils
 {
 
 class ViewBoxItem : public QQuickItem
diff --git a/src/quickvectorgraphics/qquickvectorgraphicsglobal_p.h b/src/quickvectorimage/qquickvectorimageglobal_p.h
index a9fdc6e026..83b96642c1 100644
--- a/src/quickvectorgraphics/qquickvectorgraphicsglobal_p.h
+++ b/src/quickvectorimage/qquickvectorimageglobal_p.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QTQUICKVECTORGRAPHICSGLOBAL_P_H
-#define QTQUICKVECTORGRAPHICSGLOBAL_P_H
+#ifndef QTQUICKVECTORIMAGEGLOBAL_P_H
+#define QTQUICKVECTORIMAGEGLOBAL_P_H
 
 //
 //  W A R N I N G
@@ -16,11 +16,11 @@
 //
 
 #include <QtCore/qglobal.h>
-#include <QtQuickVectorGraphicsGenerator/qtquickvectorgraphicsgeneratorexports.h>
+#include <QtQuickVectorImageGenerator/qtquickvectorimagegeneratorexports.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace QQuickVectorGraphics
+namespace QQuickVectorImageGenerator
 {
     enum PathSelector {
         FillPath = 0x1,
@@ -40,4 +40,4 @@ namespace QQuickVectorGraphics
 
 QT_END_NAMESPACE
 
-#endif //QTQUICKVECTORGRAPHICSGLOBAL_P_H
+#endif //QTQUICKVECTORIMAGEGLOBAL_P_H
diff --git a/tools/svgtoqml/CMakeLists.txt b/tools/svgtoqml/CMakeLists.txt
index 9511212627..fd6c91e7ea 100644
--- a/tools/svgtoqml/CMakeLists.txt
+++ b/tools/svgtoqml/CMakeLists.txt
@@ -16,7 +16,7 @@ qt_internal_add_tool(${target_name}
         Qt::Gui
         Qt::Qml
         Qt::Quick
-        Qt::QuickVectorGraphicsGeneratorPrivate
+        Qt::QuickVectorImageGeneratorPrivate
 )
 qt_internal_return_unless_building_tools()
 
diff --git a/tools/svgtoqml/main.cpp b/tools/svgtoqml/main.cpp
index 91d55b73eb..b5b7aa6b00 100644
--- a/tools/svgtoqml/main.cpp
+++ b/tools/svgtoqml/main.cpp
@@ -7,9 +7,9 @@
 #include <QFile>
 #include <QQuickWindow>
 #include <QQuickItem>
-#include <QtQuickVectorGraphicsGenerator/private/qquickitemgenerator_p.h>
-#include <QtQuickVectorGraphicsGenerator/private/qquickqmlgenerator_p.h>
-#include <QtQuickVectorGraphicsGenerator/private/qquickvectorgraphicsglobal_p.h>
+#include <QtQuickVectorImageGenerator/private/qquickitemgenerator_p.h>
+#include <QtQuickVectorImageGenerator/private/qquickqmlgenerator_p.h>
+#include <QtQuickVectorImageGenerator/private/qquickvectorimageglobal_p.h>
 
 #define ENABLE_GUI
 
@@ -74,14 +74,14 @@ int main(int argc, char *argv[])
         commentString = copyrightString + u"\n" + commentString;
     }
 
-    QQuickVectorGraphics::GeneratorFlags flags;
+    QQuickVectorImageGenerator::GeneratorFlags flags;
     if (parser.isSet(curveRendererOption))
-        flags |= QQuickVectorGraphics::GeneratorFlag::CurveRenderer;
+        flags |= QQuickVectorImageGenerator::GeneratorFlag::CurveRenderer;
     if (parser.isSet(optimizeOption))
-        flags |= QQuickVectorGraphics::GeneratorFlag::OptimizePaths;
+        flags |= QQuickVectorImageGenerator::GeneratorFlag::OptimizePaths;
     if (parser.isSet(outlineModeOption))
-        flags |= (QQuickVectorGraphics::GeneratorFlag::OutlineStrokeMode
-                  | QQuickVectorGraphics::GeneratorFlag::OptimizePaths);
+        flags |= (QQuickVectorImageGenerator::GeneratorFlag::OutlineStrokeMode
+                  | QQuickVectorImageGenerator::GeneratorFlag::OptimizePaths);
 
     QQuickQmlGenerator generator(inFileName, flags, outFileName);
     generator.setShapeTypeName(typeName);