Clean up based on header review comments

Rename QSvg namespace to QtSvg, explicitly set the value of the
FeatureSet::AllAvailable value to UINT_MAX so that all bits are set,
and fix minor styling issues.

Pick-to: 6.7
Change-Id: I173a8c26140b9fd1311113f679d3f4162c2cef5f
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

17 files changed, 174 insertions, 173 deletions

diff --git a/src/svg/doc/src/qsvgglobal.qdoc b/src/svg/doc/src/qsvgglobal.qdoc
index afee1d4..0047728 100644
--- a/src/svg/doc/src/qsvgglobal.qdoc
+++ b/src/svg/doc/src/qsvgglobal.qdoc
@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 /*!
-    \namespace QSvg
-    \brief The QSvg namespace contains enums used by the svg classes.
+    \namespace QtSvg
+    \brief The QtSvg namespace contains enums used by the svg classes.
     \inmodule QtSvg
 */
 
 /*!
-    \enum QSvg::FeatureSet
+    \enum QtSvg::FeatureSet
 
     This enum is used to control the parsing and renderering of features
     that go beyond the \l{http://www.w3.org/TR/SVGMobile12}{SVG 1.2 Tiny}
diff --git a/src/svg/qsvgfilter.cpp b/src/svg/qsvgfilter.cpp
index 59d928d..f773ec6 100644
--- a/src/svg/qsvgfilter.cpp
+++ b/src/svg/qsvgfilter.cpp
@@ -27,11 +27,11 @@ QSvgFeFilterPrimitive::QSvgFeFilterPrimitive(QSvgNode *parent, QString input, QS
 
 QRectF QSvgFeFilterPrimitive::localFilterBoundingBox(QSvgNode *node,
                                                      const QRectF &itemBounds, const QRectF &filterBounds,
-                                                     QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const
+                                                     QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const
 {
 
     QRectF localBounds;
-    if (filterUnits != QSvg::UnitTypes::userSpaceOnUse)
+    if (filterUnits != QtSvg::UnitTypes::userSpaceOnUse)
         localBounds = itemBounds;
     else
         localBounds = filterBounds;
@@ -43,7 +43,7 @@ QRectF QSvgFeFilterPrimitive::localFilterBoundingBox(QSvgNode *node,
 
 QRectF QSvgFeFilterPrimitive::globalFilterBoundingBox(QSvgNode *item, QPainter *p,
                                                       const QRectF &itemBounds, const QRectF &filterBounds,
-                                                      QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const
+                                                      QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const
 {
     return p->transform().mapRect(localFilterBoundingBox(item, itemBounds, filterBounds, primitiveUnits, filterUnits));
 }
@@ -184,7 +184,7 @@ QSvgNode::Type QSvgFeColorMatrix::type() const
 
 QImage QSvgFeColorMatrix::apply(QSvgNode *item, const QMap<QString, QImage> &sources, QPainter *p,
                                 const QRectF &itemBounds, const QRectF &filterBounds,
-                                QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const
+                                QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const
 {
     if (!sources.contains(m_input))
         return QImage();
@@ -275,7 +275,7 @@ QSvgNode::Type QSvgFeGaussianBlur::type() const
 
 QImage QSvgFeGaussianBlur::apply(QSvgNode *item, const QMap<QString, QImage> &sources, QPainter *p,
                                  const QRectF &itemBounds, const QRectF &filterBounds,
-                                 QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const
+                                 QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const
 {
     if (!sources.contains(m_input))
         return QImage();
@@ -286,7 +286,7 @@ QImage QSvgFeGaussianBlur::apply(QSvgNode *item, const QMap<QString, QImage> &so
             p->transform().map(QPointF(0, 0));
     qreal sigma_x = sigma_scaled.x();
     qreal sigma_y = sigma_scaled.y();
-    if (primitiveUnits == QSvg::UnitTypes::objectBoundingBox) {
+    if (primitiveUnits == QtSvg::UnitTypes::objectBoundingBox) {
         sigma_x *= itemBounds.width();
         sigma_y *= itemBounds.height();
     }
@@ -375,7 +375,7 @@ QSvgNode::Type QSvgFeOffset::type() const
 
 QImage QSvgFeOffset::apply(QSvgNode *item, const QMap<QString, QImage> &sources, QPainter *p,
                            const QRectF &itemBounds, const QRectF &filterBounds,
-                           QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const
+                           QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const
 {
     if (!sources.contains(m_input))
         return QImage();
@@ -386,7 +386,7 @@ QImage QSvgFeOffset::apply(QSvgNode *item, const QMap<QString, QImage> &sources,
     QRect clipRectGlob = p->transform().mapRect(clipRect).toRect();
 
     QPoint offset(m_dx, m_dy);
-    if (primitiveUnits == QSvg::UnitTypes::objectBoundingBox) {
+    if (primitiveUnits == QtSvg::UnitTypes::objectBoundingBox) {
         offset = QPoint(m_dx * itemBounds.width(),
                         m_dy * itemBounds.height());
     }
@@ -429,7 +429,7 @@ QSvgNode::Type QSvgFeMerge::type() const
 
 QImage QSvgFeMerge::apply(QSvgNode *item, const QMap<QString, QImage> &sources, QPainter *p,
                           const QRectF &itemBounds, const QRectF &filterBounds,
-                          QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const
+                          QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const
 {
     QList<QImage> mergeNodeResults;
     QRect requiredRect;
@@ -493,7 +493,7 @@ QSvgNode::Type QSvgFeMergeNode::type() const
 }
 
 QImage QSvgFeMergeNode::apply(QSvgNode *, const QMap<QString, QImage> &sources, QPainter *,
-                              const QRectF &, const QRectF &, QSvg::UnitTypes, QSvg::UnitTypes) const
+                              const QRectF &, const QRectF &, QtSvg::UnitTypes, QtSvg::UnitTypes) const
 {
     return sources.value(m_input);
 }
@@ -515,7 +515,7 @@ QSvgNode::Type QSvgFeComposite::type() const
 
 QImage QSvgFeComposite::apply(QSvgNode *item, const QMap<QString, QImage> &sources, QPainter *p,
                               const QRectF &itemBounds, const QRectF &filterBounds,
-                              QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const
+                              QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const
 {
     if (!sources.contains(m_input))
         return QImage();
@@ -656,7 +656,7 @@ QSvgNode::Type QSvgFeFlood::type() const
 
 QImage QSvgFeFlood::apply(QSvgNode *item, const QMap<QString, QImage> &,
                           QPainter *p, const QRectF &itemBounds, const QRectF &filterBounds,
-                          QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const
+                          QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const
 {
 
     QRectF clipRect = localFilterBoundingBox(item, itemBounds, filterBounds, primitiveUnits, filterUnits);
diff --git a/src/svg/qsvgfilter_p.h b/src/svg/qsvgfilter_p.h
index 22ecc59..70c50de 100644
--- a/src/svg/qsvgfilter_p.h
+++ b/src/svg/qsvgfilter_p.h
@@ -35,14 +35,14 @@ public:
     QRectF bounds(QPainter *, QSvgExtraStates &) const override { return QRectF(); }
     QRectF localFilterBoundingBox(QSvgNode *item,
                                   const QRectF &itemBounds, const QRectF &filterBounds,
-                                  QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const;
+                                  QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const;
     QRectF globalFilterBoundingBox(QSvgNode *item, QPainter *p,
                                    const QRectF &itemBounds, const QRectF &filterBounds,
-                                   QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const;
+                                   QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const;
     void clipToTransformedBounds(QImage *buffer, QPainter *p, const QRectF &localRect) const;
     virtual QImage apply(QSvgNode *item, const QMap<QString, QImage> &sources,
                          QPainter *p, const QRectF &itemBounds, const QRectF &filterBounds,
-                         QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const = 0;
+                         QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const = 0;
     virtual bool requiresSourceAlpha() const;
     QString input() const {
         return m_input;
@@ -79,7 +79,7 @@ public:
     Type type() const override;
     QImage apply(QSvgNode *item, const QMap<QString, QImage> &sources,
                  QPainter *p, const QRectF &itemBounds, const QRectF &filterBounds,
-                 QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const override;
+                 QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const override;
 private:
     ColorShiftType m_type;
     Matrix m_matrix;
@@ -99,7 +99,7 @@ public:
     Type type() const override;
     QImage apply(QSvgNode *item, const QMap<QString, QImage> &sources,
                  QPainter *p, const QRectF &itemBounds, const QRectF &filterBounds,
-                 QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const override;
+                 QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const override;
 private:
     qreal m_stdDeviationX;
     qreal m_stdDeviationY;
@@ -114,7 +114,7 @@ public:
     Type type() const override;
     QImage apply(QSvgNode *item, const QMap<QString, QImage> &sources,
                  QPainter *p, const QRectF &itemBounds, const QRectF &filterBounds,
-                 QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const override;
+                 QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const override;
 private:
     qreal m_dx;
     qreal m_dy;
@@ -127,7 +127,7 @@ public:
     Type type() const override;
     QImage apply(QSvgNode *item, const QMap<QString, QImage> &sources,
                  QPainter *p, const QRectF &itemBounds, const QRectF &filterBounds,
-                 QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const override;
+                 QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const override;
     bool requiresSourceAlpha() const override;
 };
 
@@ -138,7 +138,7 @@ public:
     Type type() const override;
     QImage apply(QSvgNode *item, const QMap<QString, QImage> &sources,
                  QPainter *p, const QRectF &itemBounds, const QRectF &filterBounds,
-                 QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const override;
+                 QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const override;
 };
 
 class Q_SVG_EXPORT QSvgFeComposite : public QSvgFeFilterPrimitive
@@ -158,7 +158,7 @@ public:
     Type type() const override;
     QImage apply(QSvgNode *item, const QMap<QString, QImage> &sources,
                  QPainter *p, const QRectF &itemBounds, const QRectF &filterBounds,
-                 QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const override;
+                 QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const override;
     bool requiresSourceAlpha() const override;
 private:
     QString m_input2;
@@ -173,7 +173,7 @@ public:
     Type type() const override;
     QImage apply(QSvgNode *item, const QMap<QString, QImage> &sources,
                  QPainter *p, const QRectF &itemBounds, const QRectF &filterBounds,
-                 QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const override;
+                 QtSvg::UnitTypes primitiveUnits, QtSvg::UnitTypes filterUnits) const override;
 private:
     QColor m_color;
 };
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 4a091cb..65fafb7 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -243,7 +243,7 @@ QSvgAttributes::QSvgAttributes(const QXmlStreamAttributes &xmlAttributes, QSvgHa
             else if (name == QLatin1String("font-variant"))
                 fontVariant = value;
             else if (name == QLatin1String("filter") &&
-                     handler->featureSet() != QSvg::FeatureSet::StaticTiny1_2)
+                     handler->featureSet() != QtSvg::FeatureSet::StaticTiny1_2)
                 filter = value;
             break;
 
@@ -256,16 +256,16 @@ QSvgAttributes::QSvgAttributes(const QXmlStreamAttributes &xmlAttributes, QSvgHa
 
         case 'm':
             if (name == QLatin1String("mask") &&
-                handler->featureSet() != QSvg::FeatureSet::StaticTiny1_2)
+                handler->featureSet() != QtSvg::FeatureSet::StaticTiny1_2)
                 mask = value;
             if (name == QLatin1String("marker-start") &&
-                handler->featureSet() != QSvg::FeatureSet::StaticTiny1_2)
+                handler->featureSet() != QtSvg::FeatureSet::StaticTiny1_2)
                 markerStart = value;
             if (name == QLatin1String("marker-mid") &&
-                handler->featureSet() != QSvg::FeatureSet::StaticTiny1_2)
+                handler->featureSet() != QtSvg::FeatureSet::StaticTiny1_2)
                 markerMid = value;
             if (name == QLatin1String("marker-end") &&
-                handler->featureSet() != QSvg::FeatureSet::StaticTiny1_2)
+                handler->featureSet() != QtSvg::FeatureSet::StaticTiny1_2)
                 markerEnd = value;
             break;
 
@@ -372,7 +372,7 @@ QSvgAttributes::QSvgAttributes(const QXmlStreamAttributes &xmlAttributes, QSvgHa
                 else if (name == QLatin1String("font-variant"))
                     fontVariant = value;
                 else if (name == QLatin1String("filter") &&
-                         handler->featureSet() != QSvg::FeatureSet::StaticTiny1_2)
+                         handler->featureSet() != QtSvg::FeatureSet::StaticTiny1_2)
                     filter = value;
                 break;
 
@@ -383,16 +383,16 @@ QSvgAttributes::QSvgAttributes(const QXmlStreamAttributes &xmlAttributes, QSvgHa
 
             case 'm':
                 if (name == QLatin1String("mask") &&
-                    handler->featureSet() != QSvg::FeatureSet::StaticTiny1_2)
+                    handler->featureSet() != QtSvg::FeatureSet::StaticTiny1_2)
                     mask = value;
                 if (name == QLatin1String("marker-start") &&
-                    handler->featureSet() != QSvg::FeatureSet::StaticTiny1_2)
+                    handler->featureSet() != QtSvg::FeatureSet::StaticTiny1_2)
                     markerStart = value;
                 if (name == QLatin1String("marker-mid") &&
-                    handler->featureSet() != QSvg::FeatureSet::StaticTiny1_2)
+                    handler->featureSet() != QtSvg::FeatureSet::StaticTiny1_2)
                     markerMid = value;
                 if (name == QLatin1String("marker-end") &&
-                    handler->featureSet() != QSvg::FeatureSet::StaticTiny1_2)
+                    handler->featureSet() != QtSvg::FeatureSet::StaticTiny1_2)
                     markerEnd = value;
                 break;
 
@@ -2065,7 +2065,7 @@ static void cssStyleLookup(QSvgNode *node,
 
 #endif // QT_NO_CSSPARSER
 
-QSvg::FeatureSet QSvgHandler::featureSet() const
+QtSvg::FeatureSet QSvgHandler::featureSet() const
 {
     return m_featureSet;
 }
@@ -2276,7 +2276,7 @@ static void parseExtendedAttributes(QSvgNode *node,
                                     const QSvgAttributes &attributes,
                                     QSvgHandler *handler)
 {
-    if (handler->featureSet() == QSvg::FeatureSet::StaticTiny1_2)
+    if (handler->featureSet() == QtSvg::FeatureSet::StaticTiny1_2)
         return;
 
     if (!attributes.mask.isEmpty()) {
@@ -2291,7 +2291,7 @@ static void parseExtendedAttributes(QSvgNode *node,
     }
 
     if (!attributes.markerStart.isEmpty() &&
-        handler->featureSet() != QSvg::FeatureSet::StaticTiny1_2) {
+        handler->featureSet() != QtSvg::FeatureSet::StaticTiny1_2) {
         QString markerStr = attributes.markerStart.toString().trimmed();
         if (markerStr.size() > 3 && markerStr.mid(0, 3) == QLatin1String("url"))
             markerStr = markerStr.mid(3, markerStr.size() - 3);
@@ -2301,7 +2301,7 @@ static void parseExtendedAttributes(QSvgNode *node,
         node->setMarkerStartId(markerId);
     }
     if (!attributes.markerMid.isEmpty() &&
-        handler->featureSet() != QSvg::FeatureSet::StaticTiny1_2) {
+        handler->featureSet() != QtSvg::FeatureSet::StaticTiny1_2) {
         QString markerStr = attributes.markerMid.toString().trimmed();
         if (markerStr.size() > 3 && markerStr.mid(0, 3) == QLatin1String("url"))
             markerStr = markerStr.mid(3, markerStr.size() - 3);
@@ -2311,7 +2311,7 @@ static void parseExtendedAttributes(QSvgNode *node,
         node->setMarkerMidId(markerId);
     }
     if (!attributes.markerEnd.isEmpty() &&
-        handler->featureSet() != QSvg::FeatureSet::StaticTiny1_2) {
+        handler->featureSet() != QtSvg::FeatureSet::StaticTiny1_2) {
         QString markerStr = attributes.markerEnd.toString().trimmed();
         if (markerStr.size() > 3 && markerStr.mid(0, 3) == QLatin1String("url"))
             markerStr = markerStr.mid(3, markerStr.size() - 3);
@@ -2322,7 +2322,7 @@ static void parseExtendedAttributes(QSvgNode *node,
     }
 
     if (!attributes.filter.isEmpty() &&
-        handler->featureSet() != QSvg::FeatureSet::StaticTiny1_2) {
+        handler->featureSet() != QtSvg::FeatureSet::StaticTiny1_2) {
         QString filterStr = attributes.filter.toString().trimmed();
 
         if (filterStr.size() > 3 && filterStr.mid(0, 3) == QLatin1String("url"))
@@ -3066,25 +3066,25 @@ static QSvgNode *createMaskNode(QSvgNode *parent,
     const QStringView mU     = attributes.value(QLatin1String("maskUnits"));
     const QStringView mCU    = attributes.value(QLatin1String("maskContentUnits"));
 
-    QSvg::UnitTypes nmU = mU.contains(QLatin1String("userSpaceOnUse")) ?
-                QSvg::UnitTypes::userSpaceOnUse : QSvg::UnitTypes::objectBoundingBox;
+    QtSvg::UnitTypes nmU = mU.contains(QLatin1String("userSpaceOnUse")) ?
+                QtSvg::UnitTypes::userSpaceOnUse : QtSvg::UnitTypes::objectBoundingBox;
 
-    QSvg::UnitTypes nmCU = mCU.contains(QLatin1String("objectBoundingBox")) ?
-                QSvg::UnitTypes::objectBoundingBox : QSvg::UnitTypes::userSpaceOnUse;
+    QtSvg::UnitTypes nmCU = mCU.contains(QLatin1String("objectBoundingBox")) ?
+                QtSvg::UnitTypes::objectBoundingBox : QtSvg::UnitTypes::userSpaceOnUse;
 
     bool ok;
     QSvgHandler::LengthType type;
 
-    QSvg::UnitTypes nmUx = nmU;
-    QSvg::UnitTypes nmUy = nmU;
-    QSvg::UnitTypes nmUw = nmU;
-    QSvg::UnitTypes nmUh = nmU;
+    QtSvg::UnitTypes nmUx = nmU;
+    QtSvg::UnitTypes nmUy = nmU;
+    QtSvg::UnitTypes nmUw = nmU;
+    QtSvg::UnitTypes nmUh = nmU;
     qreal nx = parseLength(x.toString(), &type, handler, &ok);
     nx = convertToPixels(nx, true, type);
     if (x.isEmpty() || !ok) {
         nx = -0.1;
-        nmUx = QSvg::UnitTypes::objectBoundingBox;
-    } else if (type == QSvgHandler::LT_PERCENT && nmU == QSvg::UnitTypes::userSpaceOnUse) {
+        nmUx = QtSvg::UnitTypes::objectBoundingBox;
+    } else if (type == QSvgHandler::LT_PERCENT && nmU == QtSvg::UnitTypes::userSpaceOnUse) {
         nx = nx / 100. * parent->document()->viewBox().width();
     } else if (type == QSvgHandler::LT_PERCENT) {
         nx = nx / 100.;
@@ -3094,8 +3094,8 @@ static QSvgNode *createMaskNode(QSvgNode *parent,
     ny = convertToPixels(ny, true, type);
     if (y.isEmpty() || !ok) {
         ny = -0.1;
-        nmUy = QSvg::UnitTypes::objectBoundingBox;
-    } else if (type == QSvgHandler::LT_PERCENT && nmU == QSvg::UnitTypes::userSpaceOnUse) {
+        nmUy = QtSvg::UnitTypes::objectBoundingBox;
+    } else if (type == QSvgHandler::LT_PERCENT && nmU == QtSvg::UnitTypes::userSpaceOnUse) {
         ny = ny / 100. * parent->document()->viewBox().height();
     } else if (type == QSvgHandler::LT_PERCENT) {
         ny = ny / 100.;
@@ -3105,8 +3105,8 @@ static QSvgNode *createMaskNode(QSvgNode *parent,
     nwidth = convertToPixels(nwidth, true, type);
     if (width.isEmpty() || !ok) {
         nwidth = 1.2;
-        nmUw = QSvg::UnitTypes::objectBoundingBox;
-    } else if (type == QSvgHandler::LT_PERCENT && nmU == QSvg::UnitTypes::userSpaceOnUse) {
+        nmUw = QtSvg::UnitTypes::objectBoundingBox;
+    } else if (type == QSvgHandler::LT_PERCENT && nmU == QtSvg::UnitTypes::userSpaceOnUse) {
         nwidth = nwidth / 100. * parent->document()->viewBox().width();
     } else if (type == QSvgHandler::LT_PERCENT) {
         nwidth = nwidth / 100.;
@@ -3116,8 +3116,8 @@ static QSvgNode *createMaskNode(QSvgNode *parent,
     nheight = convertToPixels(nheight, true, type);
     if (height.isEmpty() || !ok) {
         nheight = 1.2;
-        nmUh = QSvg::UnitTypes::objectBoundingBox;
-    } else if (type == QSvgHandler::LT_PERCENT && nmU == QSvg::UnitTypes::userSpaceOnUse) {
+        nmUh = QtSvg::UnitTypes::objectBoundingBox;
+    } else if (type == QSvgHandler::LT_PERCENT && nmU == QtSvg::UnitTypes::userSpaceOnUse) {
         nheight = nheight / 100. * parent->document()->viewBox().height();
     } else if (type == QSvgHandler::LT_PERCENT) {
         nheight = nheight / 100.;
@@ -3149,7 +3149,7 @@ static void parseFilterBounds(QSvgNode *, const QXmlStreamAttributes &attributes
         rect->setX(x);
     } else {
         rect->setX(-0.1);
-        rect->setUnitX(QSvg::UnitTypes::objectBoundingBox);
+        rect->setUnitX(QtSvg::UnitTypes::objectBoundingBox);
     }
     qreal y = 0;
     if (!yStr.isEmpty()) {
@@ -3160,7 +3160,7 @@ static void parseFilterBounds(QSvgNode *, const QXmlStreamAttributes &attributes
         rect->setY(y);
     } else {
         rect->setY(-0.1);
-        rect->setUnitY(QSvg::UnitTypes::objectBoundingBox);
+        rect->setUnitY(QtSvg::UnitTypes::objectBoundingBox);
     }
     qreal width = 0;
     if (!widthStr.isEmpty()) {
@@ -3171,7 +3171,7 @@ static void parseFilterBounds(QSvgNode *, const QXmlStreamAttributes &attributes
         rect->setWidth(width);
     } else {
         rect->setWidth(1.2);
-        rect->setUnitW(QSvg::UnitTypes::objectBoundingBox);
+        rect->setUnitW(QtSvg::UnitTypes::objectBoundingBox);
     }
     qreal height = 0;
     if (!heightStr.isEmpty()) {
@@ -3182,7 +3182,7 @@ static void parseFilterBounds(QSvgNode *, const QXmlStreamAttributes &attributes
         rect->setHeight(height);
     } else {
         rect->setHeight(1.2);
-        rect->setUnitH(QSvg::UnitTypes::objectBoundingBox);
+        rect->setUnitH(QtSvg::UnitTypes::objectBoundingBox);
     }
 }
 
@@ -3193,11 +3193,11 @@ static QSvgNode *createFilterNode(QSvgNode *parent,
     QString fU = attributes.value(QLatin1String("filterUnits")).toString();
     QString pU = attributes.value(QLatin1String("primitiveUnits")).toString();
 
-    QSvg::UnitTypes filterUnits = fU.contains(QLatin1String("userSpaceOnUse")) ?
-                QSvg::UnitTypes::userSpaceOnUse : QSvg::UnitTypes::objectBoundingBox;
+    QtSvg::UnitTypes filterUnits = fU.contains(QLatin1String("userSpaceOnUse")) ?
+                QtSvg::UnitTypes::userSpaceOnUse : QtSvg::UnitTypes::objectBoundingBox;
 
-    QSvg::UnitTypes primitiveUnits = pU.contains(QLatin1String("objectBoundingBox")) ?
-                QSvg::UnitTypes::objectBoundingBox : QSvg::UnitTypes::userSpaceOnUse;
+    QtSvg::UnitTypes primitiveUnits = pU.contains(QLatin1String("objectBoundingBox")) ?
+                QtSvg::UnitTypes::objectBoundingBox : QtSvg::UnitTypes::userSpaceOnUse;
 
     QSvgRectF rect;
     parseFilterBounds(parent, attributes, handler, &rect);
@@ -3990,11 +3990,11 @@ static QSvgNode *createPatternNode(QSvgNode *parent,
     const QStringView patternContentUnits    = attributes.value(QLatin1String("patternContentUnits"));
     const QStringView patternTransform = attributes.value(QLatin1String("patternTransform"));
 
-    QSvg::UnitTypes nPatternUnits = patternUnits.contains(QLatin1String("userSpaceOnUse")) ?
-                                        QSvg::UnitTypes::userSpaceOnUse : QSvg::UnitTypes::objectBoundingBox;
+    QtSvg::UnitTypes nPatternUnits = patternUnits.contains(QLatin1String("userSpaceOnUse")) ?
+                                        QtSvg::UnitTypes::userSpaceOnUse : QtSvg::UnitTypes::objectBoundingBox;
 
-    QSvg::UnitTypes nPatternContentUnits = patternContentUnits.contains(QLatin1String("objectBoundingBox")) ?
-                                               QSvg::UnitTypes::objectBoundingBox : QSvg::UnitTypes::userSpaceOnUse;
+    QtSvg::UnitTypes nPatternContentUnits = patternContentUnits.contains(QLatin1String("objectBoundingBox")) ?
+                                               QtSvg::UnitTypes::objectBoundingBox : QtSvg::UnitTypes::userSpaceOnUse;
 
     QString viewBoxStr = attributes.value(QLatin1String("viewBox")).toString();
 
@@ -4005,7 +4005,7 @@ static QSvgNode *createPatternNode(QSvgNode *parent,
     nx = convertToPixels(nx, true, type);
     if (!ok)
         nx = 0.0;
-    else if (type == QSvgHandler::LT_PERCENT && nPatternUnits == QSvg::UnitTypes::userSpaceOnUse)
+    else if (type == QSvgHandler::LT_PERCENT && nPatternUnits == QtSvg::UnitTypes::userSpaceOnUse)
         nx = (nx / 100.) * handler->document()->viewBox().width();
     else if (type == QSvgHandler::LT_PERCENT)
         nx = nx / 100.;
@@ -4014,7 +4014,7 @@ static QSvgNode *createPatternNode(QSvgNode *parent,
     ny = convertToPixels(ny, true, type);
     if (!ok)
         ny = 0.0;
-    else if (type == QSvgHandler::LT_PERCENT && nPatternUnits == QSvg::UnitTypes::userSpaceOnUse)
+    else if (type == QSvgHandler::LT_PERCENT && nPatternUnits == QtSvg::UnitTypes::userSpaceOnUse)
         ny = (ny / 100.) * handler->document()->viewBox().height();
     else if (type == QSvgHandler::LT_PERCENT)
         ny = ny / 100.;
@@ -4023,7 +4023,7 @@ static QSvgNode *createPatternNode(QSvgNode *parent,
     nwidth = convertToPixels(nwidth, true, type);
     if (!ok)
         nwidth = 0.0;
-    else if (type == QSvgHandler::LT_PERCENT && nPatternUnits == QSvg::UnitTypes::userSpaceOnUse)
+    else if (type == QSvgHandler::LT_PERCENT && nPatternUnits == QtSvg::UnitTypes::userSpaceOnUse)
         nwidth = (nwidth / 100.) * handler->document()->viewBox().width();
     else if (type == QSvgHandler::LT_PERCENT)
         nwidth = nwidth / 100.;
@@ -4032,7 +4032,7 @@ static QSvgNode *createPatternNode(QSvgNode *parent,
     nheight = convertToPixels(nheight, true, type);
     if (!ok)
         nheight = 0.0;
-    else if (type == QSvgHandler::LT_PERCENT && nPatternUnits == QSvg::UnitTypes::userSpaceOnUse)
+    else if (type == QSvgHandler::LT_PERCENT && nPatternUnits == QtSvg::UnitTypes::userSpaceOnUse)
         nheight = (nheight / 100.) * handler->document()->viewBox().height();
     else if (type == QSvgHandler::LT_PERCENT)
         nheight = nheight / 100.;
@@ -4196,7 +4196,7 @@ static QSvgNode *createVideoNode(QSvgNode *parent,
 
 typedef QSvgNode *(*FactoryMethod)(QSvgNode *, const QXmlStreamAttributes &, QSvgHandler *);
 
-static FactoryMethod findGroupFactory(const QString &name, QSvg::FeatureSet featureSet)
+static FactoryMethod findGroupFactory(const QString &name, QtSvg::FeatureSet featureSet)
 {
     Q_UNUSED(featureSet);
     if (name.isEmpty())
@@ -4208,14 +4208,14 @@ static FactoryMethod findGroupFactory(const QString &name, QSvg::FeatureSet feat
         if (ref == QLatin1String("efs")) return createDefsNode;
         break;
     case 'f':
-        if (ref == QLatin1String("ilter") && featureSet != QSvg::FeatureSet::StaticTiny1_2) return createFilterNode;
+        if (ref == QLatin1String("ilter") && featureSet != QtSvg::FeatureSet::StaticTiny1_2) return createFilterNode;
         break;
     case 'g':
         if (ref.isEmpty()) return createGNode;
         break;
     case 'm':
-        if (ref == QLatin1String("ask") && featureSet != QSvg::FeatureSet::StaticTiny1_2) return createMaskNode;
-        if (ref == QLatin1String("arker") && featureSet != QSvg::FeatureSet::StaticTiny1_2) return createMarkerNode;
+        if (ref == QLatin1String("ask") && featureSet != QtSvg::FeatureSet::StaticTiny1_2) return createMaskNode;
+        if (ref == QLatin1String("arker") && featureSet != QtSvg::FeatureSet::StaticTiny1_2) return createMarkerNode;
         break;
     case 's':
         if (ref == QLatin1String("vg")) return createSvgNode;
@@ -4223,7 +4223,7 @@ static FactoryMethod findGroupFactory(const QString &name, QSvg::FeatureSet feat
         if (ref == QLatin1String("ymbol")) return createSymbolNode;
         break;
     case 'p':
-        if (ref == QLatin1String("attern") && featureSet != QSvg::FeatureSet::StaticTiny1_2) return createPatternNode;
+        if (ref == QLatin1String("attern") && featureSet != QtSvg::FeatureSet::StaticTiny1_2) return createPatternNode;
         break;
     default:
         break;
@@ -4231,7 +4231,7 @@ static FactoryMethod findGroupFactory(const QString &name, QSvg::FeatureSet feat
     return 0;
 }
 
-static FactoryMethod findGraphicsFactory(const QString &name, QSvg::FeatureSet featureSet)
+static FactoryMethod findGraphicsFactory(const QString &name, QtSvg::FeatureSet featureSet)
 {
     Q_UNUSED(featureSet);
     if (name.isEmpty())
@@ -4279,9 +4279,9 @@ static FactoryMethod findGraphicsFactory(const QString &name, QSvg::FeatureSet f
     return 0;
 }
 
-static FactoryMethod findFilterFtory(const QString &name, QSvg::FeatureSet featureSet)
+static FactoryMethod findFilterFtory(const QString &name, QtSvg::FeatureSet featureSet)
 {
-    if (featureSet == QSvg::FeatureSet::StaticTiny1_2)
+    if (featureSet == QtSvg::FeatureSet::StaticTiny1_2)
         return 0;
 
     if (name.isEmpty())
@@ -4303,7 +4303,7 @@ static FactoryMethod findFilterFtory(const QString &name, QSvg::FeatureSet featu
 
 typedef bool (*ParseMethod)(QSvgNode *, const QXmlStreamAttributes &, QSvgHandler *);
 
-static ParseMethod findUtilFactory(const QString &name, QSvg::FeatureSet featureSet)
+static ParseMethod findUtilFactory(const QString &name, QtSvg::FeatureSet featureSet)
 {
     Q_UNUSED(featureSet);
     if (name.isEmpty())
@@ -4333,8 +4333,8 @@ static ParseMethod findUtilFactory(const QString &name, QSvg::FeatureSet feature
     case 'm':
         if (ref == QLatin1String("etadata")) return parseMetadataNode;
         if (ref == QLatin1String("path")) return parseMpathNode;
-        if (ref == QLatin1String("ask") && featureSet != QSvg::FeatureSet::StaticTiny1_2) return parseMaskNode;
-        if (ref == QLatin1String("arker") && featureSet != QSvg::FeatureSet::StaticTiny1_2) return parseMarkerNode;
+        if (ref == QLatin1String("ask") && featureSet != QtSvg::FeatureSet::StaticTiny1_2) return parseMaskNode;
+        if (ref == QLatin1String("arker") && featureSet != QtSvg::FeatureSet::StaticTiny1_2) return parseMarkerNode;
         break;
     case 'p':
         if (ref == QLatin1String("refetch")) return parsePrefetchNode;
@@ -4415,7 +4415,7 @@ static StyleParseMethod findStyleUtilFactoryMethod(const QString &name)
     return 0;
 }
 
-QSvgHandler::QSvgHandler(QIODevice *device, QSvg::FeatureSet featureSet)
+QSvgHandler::QSvgHandler(QIODevice *device, QtSvg::FeatureSet featureSet)
     : xml(new QXmlStreamReader(device))
     , m_ownsReader(true)
     , m_featureSet(featureSet)
@@ -4423,7 +4423,7 @@ QSvgHandler::QSvgHandler(QIODevice *device, QSvg::FeatureSet featureSet)
     init();
 }
 
-QSvgHandler::QSvgHandler(const QByteArray &data, QSvg::FeatureSet featureSet)
+QSvgHandler::QSvgHandler(const QByteArray &data, QtSvg::FeatureSet featureSet)
     : xml(new QXmlStreamReader(data))
     , m_ownsReader(true)
     , m_featureSet(featureSet)
@@ -4431,7 +4431,7 @@ QSvgHandler::QSvgHandler(const QByteArray &data, QSvg::FeatureSet featureSet)
     init();
 }
 
-QSvgHandler::QSvgHandler(QXmlStreamReader *const reader, QSvg::FeatureSet featureSet)
+QSvgHandler::QSvgHandler(QXmlStreamReader *const reader, QtSvg::FeatureSet featureSet)
     : xml(reader)
     , m_ownsReader(false)
     , m_featureSet(featureSet)
diff --git a/src/svg/qsvghandler_p.h b/src/svg/qsvghandler_p.h
index 39684ac..6dfaf46 100644
--- a/src/svg/qsvghandler_p.h
+++ b/src/svg/qsvghandler_p.h
@@ -59,9 +59,9 @@ public:
     };
 
 public:
-    QSvgHandler(QIODevice *device, QSvg::FeatureSet featureSet = QSvg::FeatureSet::AllAvailable);
-    QSvgHandler(const QByteArray &data, QSvg::FeatureSet featureSet = QSvg::FeatureSet::AllAvailable);
-    QSvgHandler(QXmlStreamReader *const data, QSvg::FeatureSet featureSet = QSvg::FeatureSet::AllAvailable);
+    QSvgHandler(QIODevice *device, QtSvg::FeatureSet featureSet = QtSvg::FeatureSet::AllAvailable);
+    QSvgHandler(const QByteArray &data, QtSvg::FeatureSet featureSet = QtSvg::FeatureSet::AllAvailable);
+    QSvgHandler(QXmlStreamReader *const data, QtSvg::FeatureSet featureSet = QtSvg::FeatureSet::AllAvailable);
     ~QSvgHandler();
 
     QIODevice *device() const;
@@ -99,7 +99,7 @@ public:
     inline QPen defaultPen() const
     { return m_defaultPen; }
 
-    QSvg::FeatureSet featureSet() const;
+    QtSvg::FeatureSet featureSet() const;
 
 public:
     bool startElement(const QString &localName, const QXmlStreamAttributes &attributes);
@@ -156,7 +156,7 @@ private:
      */
     const bool m_ownsReader;
 
-    const QSvg::FeatureSet m_featureSet;
+    const QtSvg::FeatureSet m_featureSet;
 };
 
 Q_DECLARE_LOGGING_CATEGORY(lcSvgHandler)
diff --git a/src/svg/qsvghelper_p.h b/src/svg/qsvghelper_p.h
index 1bcae28..832bf7f 100644
--- a/src/svg/qsvghelper_p.h
+++ b/src/svg/qsvghelper_p.h
@@ -25,10 +25,10 @@ class Q_SVG_EXPORT QSvgRectF : public QRectF
 {
 public:
     QSvgRectF(const QRectF &r = QRectF(),
-              QSvg::UnitTypes unitX = QSvg::UnitTypes::userSpaceOnUse,
-              QSvg::UnitTypes unitY = QSvg::UnitTypes::userSpaceOnUse,
-              QSvg::UnitTypes unitW = QSvg::UnitTypes::userSpaceOnUse,
-              QSvg::UnitTypes unitH = QSvg::UnitTypes::userSpaceOnUse)
+              QtSvg::UnitTypes unitX = QtSvg::UnitTypes::userSpaceOnUse,
+              QtSvg::UnitTypes unitY = QtSvg::UnitTypes::userSpaceOnUse,
+              QtSvg::UnitTypes unitW = QtSvg::UnitTypes::userSpaceOnUse,
+              QtSvg::UnitTypes unitH = QtSvg::UnitTypes::userSpaceOnUse)
         : QRectF(r)
         , m_unitX(unitX)
         , m_unitY(unitY)
@@ -38,19 +38,19 @@ public:
 
     QRectF combinedWithLocalRect(const QRectF &localRect) const {
         QRectF result;
-        if (m_unitX == QSvg::UnitTypes::objectBoundingBox)
+        if (m_unitX == QtSvg::UnitTypes::objectBoundingBox)
             result.setX(localRect.x() + x() * localRect.width());
         else
             result.setX(x());
-        if (m_unitY == QSvg::UnitTypes::objectBoundingBox)
+        if (m_unitY == QtSvg::UnitTypes::objectBoundingBox)
             result.setY(localRect.y() + y() * localRect.height());
         else
             result.setY(y());
-        if (m_unitW == QSvg::UnitTypes::objectBoundingBox)
+        if (m_unitW == QtSvg::UnitTypes::objectBoundingBox)
             result.setWidth(localRect.width() * width());
         else
             result.setWidth(width());
-        if (m_unitH == QSvg::UnitTypes::objectBoundingBox)
+        if (m_unitH == QtSvg::UnitTypes::objectBoundingBox)
             result.setHeight(localRect.height() * height());
         else
             result.setHeight(height());
@@ -60,40 +60,40 @@ public:
     QPointF translationRelativeToBoundingBox(const QRectF &boundingBox) const {
         QPointF result;
 
-        if (m_unitX == QSvg::UnitTypes::objectBoundingBox)
+        if (m_unitX == QtSvg::UnitTypes::objectBoundingBox)
             result.setX(x() * boundingBox.width());
         else
             result.setX(x());
-        if (m_unitY == QSvg::UnitTypes::objectBoundingBox)
+        if (m_unitY == QtSvg::UnitTypes::objectBoundingBox)
             result.setY(y() * boundingBox.height());
         else
             result.setY(y());
         return result;
     }
 
-    QRectF combinedWithLocalRect(const QRectF &localRect, const QRectF &canvasRect, QSvg::UnitTypes units) const {
+    QRectF combinedWithLocalRect(const QRectF &localRect, const QRectF &canvasRect, QtSvg::UnitTypes units) const {
         QRectF result;
-        if (units == QSvg::UnitTypes::objectBoundingBox)
+        if (units == QtSvg::UnitTypes::objectBoundingBox)
             result.setX(localRect.x() + x() * localRect.width());
-        else if (m_unitX == QSvg::UnitTypes::objectBoundingBox)
+        else if (m_unitX == QtSvg::UnitTypes::objectBoundingBox)
             result.setX(canvasRect.x() + x() * canvasRect.width());
         else
             result.setX(x());
-        if (units == QSvg::UnitTypes::objectBoundingBox)
+        if (units == QtSvg::UnitTypes::objectBoundingBox)
             result.setY(localRect.y() + y() * localRect.height());
-        else if (m_unitY == QSvg::UnitTypes::objectBoundingBox)
+        else if (m_unitY == QtSvg::UnitTypes::objectBoundingBox)
             result.setY(canvasRect.y() + y() * canvasRect.height());
         else
             result.setY(y());
-        if (units == QSvg::UnitTypes::objectBoundingBox)
+        if (units == QtSvg::UnitTypes::objectBoundingBox)
             result.setWidth(localRect.width() * width());
-        else if (m_unitW == QSvg::UnitTypes::objectBoundingBox)
+        else if (m_unitW == QtSvg::UnitTypes::objectBoundingBox)
             result.setWidth(canvasRect.width() * width());
         else
             result.setWidth(width());
-        if (units == QSvg::UnitTypes::objectBoundingBox)
+        if (units == QtSvg::UnitTypes::objectBoundingBox)
             result.setHeight(localRect.height() * height());
-        else if (m_unitH == QSvg::UnitTypes::objectBoundingBox)
+        else if (m_unitH == QtSvg::UnitTypes::objectBoundingBox)
             result.setHeight(canvasRect.height() * height());
         else
             result.setHeight(height());
@@ -101,21 +101,21 @@ public:
         return result;
     }
 
-    QSvg::UnitTypes unitX() const {return m_unitX;}
-    QSvg::UnitTypes unitY() const {return m_unitY;}
-    QSvg::UnitTypes unitW() const {return m_unitW;}
-    QSvg::UnitTypes unitH() const {return m_unitH;}
+    QtSvg::UnitTypes unitX() const {return m_unitX;}
+    QtSvg::UnitTypes unitY() const {return m_unitY;}
+    QtSvg::UnitTypes unitW() const {return m_unitW;}
+    QtSvg::UnitTypes unitH() const {return m_unitH;}
 
-    void setUnitX(QSvg::UnitTypes unit) {m_unitX = unit;}
-    void setUnitY(QSvg::UnitTypes unit) {m_unitY = unit;}
-    void setUnitW(QSvg::UnitTypes unit) {m_unitW = unit;}
-    void setUnitH(QSvg::UnitTypes unit) {m_unitH = unit;}
+    void setUnitX(QtSvg::UnitTypes unit) {m_unitX = unit;}
+    void setUnitY(QtSvg::UnitTypes unit) {m_unitY = unit;}
+    void setUnitW(QtSvg::UnitTypes unit) {m_unitW = unit;}
+    void setUnitH(QtSvg::UnitTypes unit) {m_unitH = unit;}
 
 protected:
-    QSvg::UnitTypes m_unitX,
-                    m_unitY,
-                    m_unitW,
-                    m_unitH;
+    QtSvg::UnitTypes m_unitX,
+                     m_unitY,
+                     m_unitW,
+                     m_unitH;
 };
 
 QT_END_NAMESPACE
diff --git a/src/svg/qsvgnode.cpp b/src/svg/qsvgnode.cpp
index e904c25..fa94b46 100644
--- a/src/svg/qsvgnode.cpp
+++ b/src/svg/qsvgnode.cpp
@@ -493,7 +493,7 @@ void QSvgNode::setMaskId(const QString &str)
 
 bool QSvgNode::hasMask() const
 {
-    if (document()->featureSet() == QSvg::FeatureSet::StaticTiny1_2)
+    if (document()->featureSet() == QtSvg::FeatureSet::StaticTiny1_2)
         return false;
     return !m_maskId.isEmpty();
 }
@@ -510,7 +510,7 @@ void QSvgNode::setFilterId(const QString &str)
 
 bool QSvgNode::hasFilter() const
 {
-    if (document()->featureSet() == QSvg::FeatureSet::StaticTiny1_2)
+    if (document()->featureSet() == QtSvg::FeatureSet::StaticTiny1_2)
         return false;
     return !m_filterId.isEmpty();
 }
@@ -527,7 +527,7 @@ void QSvgNode::setMarkerStartId(const QString &str)
 
 bool QSvgNode::hasMarkerStart() const
 {
-    if (document()->featureSet() == QSvg::FeatureSet::StaticTiny1_2)
+    if (document()->featureSet() == QtSvg::FeatureSet::StaticTiny1_2)
         return false;
     return !m_markerStartId.isEmpty();
 }
@@ -544,7 +544,7 @@ void QSvgNode::setMarkerMidId(const QString &str)
 
 bool QSvgNode::hasMarkerMid() const
 {
-    if (document()->featureSet() == QSvg::FeatureSet::StaticTiny1_2)
+    if (document()->featureSet() == QtSvg::FeatureSet::StaticTiny1_2)
         return false;
     return !m_markerMidId.isEmpty();
 }
@@ -561,14 +561,14 @@ void QSvgNode::setMarkerEndId(const QString &str)
 
 bool QSvgNode::hasMarkerEnd() const
 {
-    if (document()->featureSet() == QSvg::FeatureSet::StaticTiny1_2)
+    if (document()->featureSet() == QtSvg::FeatureSet::StaticTiny1_2)
         return false;
     return !m_markerEndId.isEmpty();
 }
 
 bool QSvgNode::hasAnyMarker() const
 {
-    if (document()->featureSet() == QSvg::FeatureSet::StaticTiny1_2)
+    if (document()->featureSet() == QtSvg::FeatureSet::StaticTiny1_2)
         return false;
     return hasMarkerStart() || hasMarkerMid() || hasMarkerEnd();
 }
diff --git a/src/svg/qsvgrenderer.cpp b/src/svg/qsvgrenderer.cpp
index 56c0b77..c871ddc 100644
--- a/src/svg/qsvgrenderer.cpp
+++ b/src/svg/qsvgrenderer.cpp
@@ -73,7 +73,7 @@ public:
         : QObjectPrivate(),
           render(0), timer(0),
           fps(30),
-          featureSet(QSvg::FeatureSet::AllAvailable)
+          featureSet(QtSvg::FeatureSet::AllAvailable)
     {}
 
     ~QSvgRendererPrivate()
@@ -105,7 +105,7 @@ public:
     QSvgTinyDocument *render;
     QTimer *timer;
     int fps;
-    QSvg::FeatureSet featureSet;
+    QtSvg::FeatureSet featureSet;
     bool animationEnabled = true;
 };
 
@@ -315,16 +315,16 @@ void QSvgRenderer::setAspectRatioMode(Qt::AspectRatioMode mode)
     render an SVG file. Set this propety before calling any of the load
     functions to change the behavior of the QSvgRenderer.
 
-    The default value is QSvg::AllAvailable.
+    The default value is QtSvg::AllAvailable.
  */
-QSvg::FeatureSet QSvgRenderer::featureSet() const
+QtSvg::FeatureSet QSvgRenderer::featureSet() const
 {
     Q_D(const QSvgRenderer);
     return d->featureSet;
 }
 
 
-void QSvgRenderer::setFeatureSet(QSvg::FeatureSet flags)
+void QSvgRenderer::setFeatureSet(QtSvg::FeatureSet flags)
 {
     Q_D(QSvgRenderer);
     d->featureSet = flags;
diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h
index 7e898a4..197cb33 100644
--- a/src/svg/qsvgrenderer.h
+++ b/src/svg/qsvgrenderer.h
@@ -28,7 +28,7 @@ class Q_SVG_EXPORT QSvgRenderer : public QObject
     Q_PROPERTY(int framesPerSecond READ framesPerSecond WRITE setFramesPerSecond)
     Q_PROPERTY(int currentFrame READ currentFrame WRITE setCurrentFrame)
     Q_PROPERTY(Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode)
-    Q_PROPERTY(QSvg::FeatureSet featureSet READ featureSet WRITE setFeatureSet)
+    Q_PROPERTY(QtSvg::FeatureSet featureSet READ featureSet WRITE setFeatureSet)
     Q_PROPERTY(bool animationEnabled READ isAnimationEnabled WRITE setAnimationEnabled)
 public:
     QSvgRenderer(QObject *parent = nullptr);
@@ -49,8 +49,8 @@ public:
     Qt::AspectRatioMode aspectRatioMode() const;
     void setAspectRatioMode(Qt::AspectRatioMode mode);
 
-    QSvg::FeatureSet featureSet() const;
-    void setFeatureSet(QSvg::FeatureSet flags);
+    QtSvg::FeatureSet featureSet() const;
+    void setFeatureSet(QtSvg::FeatureSet flags);
 
     bool animated() const;
     int framesPerSecond() const;
diff --git a/src/svg/qsvgstructure.cpp b/src/svg/qsvgstructure.cpp
index 1cfd441..02e6b64 100644
--- a/src/svg/qsvgstructure.cpp
+++ b/src/svg/qsvgstructure.cpp
@@ -206,7 +206,7 @@ QSvgMarker::QSvgMarker(QSvgNode *parent, QRectF bounds, QRectF viewBox, QPointF
 }
 
 QSvgFilterContainer::QSvgFilterContainer(QSvgNode *parent, const QSvgRectF &bounds,
-                                         QSvg::UnitTypes filterUnits, QSvg::UnitTypes primitiveUnits)
+                                         QtSvg::UnitTypes filterUnits, QtSvg::UnitTypes primitiveUnits)
     : QSvgStructureNode(parent)
     , m_rect(bounds)
     , m_filterUnits(filterUnits)
@@ -694,7 +694,7 @@ QSvgNode* QSvgStructureNode::previousSiblingNode(QSvgNode *n) const
 }
 
 QSvgMask::QSvgMask(QSvgNode *parent, QSvgRectF bounds,
-                   QSvg::UnitTypes contentUnits)
+                   QtSvg::UnitTypes contentUnits)
     : QSvgStructureNode(parent)
     , m_rect(bounds)
     , m_contentUnits(contentUnits)
@@ -755,7 +755,7 @@ QImage QSvgMask::createMask(QPainter *p, QSvgExtraStates &states, const QRectF &
     QSvgExtraStates states2; // Fake states so scopes do not propagate
 
     QTransform oldT = painter.transform();
-    if (m_contentUnits == QSvg::UnitTypes::objectBoundingBox){
+    if (m_contentUnits == QtSvg::UnitTypes::objectBoundingBox){
         painter.translate(localRect.topLeft());
         painter.scale(localRect.width(), localRect.height());
     }
@@ -799,7 +799,7 @@ QSvgNode::Type QSvgMask::type() const
 }
 
 QSvgPattern::QSvgPattern(QSvgNode *parent, QSvgRectF bounds, QRectF viewBox,
-                         QSvg::UnitTypes contentUnits, QTransform transform)
+                         QtSvg::UnitTypes contentUnits, QTransform transform)
     : QSvgStructureNode(parent),
     m_rect(bounds),
     m_viewBox(viewBox),
@@ -847,7 +847,7 @@ QImage QSvgPattern::patternImage(QPainter *p, QSvgExtraStates &states, const QSv
     // by its local size.
     qreal contentScaleFactorX = m_transform.m11();
     qreal contentScaleFactorY = m_transform.m22();
-    if (m_contentUnits == QSvg::UnitTypes::userSpaceOnUse) {
+    if (m_contentUnits == QtSvg::UnitTypes::userSpaceOnUse) {
         contentScaleFactorX *= t.m11();
         contentScaleFactorY *= t.m22();
     } else {
diff --git a/src/svg/qsvgstructure_p.h b/src/svg/qsvgstructure_p.h
index f9e9ae0..c5b4014 100644
--- a/src/svg/qsvgstructure_p.h
+++ b/src/svg/qsvgstructure_p.h
@@ -161,14 +161,14 @@ class Q_SVG_EXPORT QSvgFilterContainer : public QSvgStructureNode
 {
 public:
 
-    QSvgFilterContainer(QSvgNode *parent, const QSvgRectF &bounds, QSvg::UnitTypes filterUnits, QSvg::UnitTypes primitiveUnits);
+    QSvgFilterContainer(QSvgNode *parent, const QSvgRectF &bounds, QtSvg::UnitTypes filterUnits, QtSvg::UnitTypes primitiveUnits);
     void drawCommand(QPainter *, QSvgExtraStates &) override {};
     Type type() const override;
     QImage applyFilter(QSvgNode *referenceNode, const QImage &buffer, QPainter *p, QRectF bounds) const;
 private:
     QSvgRectF m_rect;
-    QSvg::UnitTypes m_filterUnits;
-    QSvg::UnitTypes m_primitiveUnits;
+    QtSvg::UnitTypes m_filterUnits;
+    QtSvg::UnitTypes m_primitiveUnits;
 };
 
 
@@ -189,21 +189,21 @@ class Q_SVG_EXPORT QSvgMask : public QSvgStructureNode
 {
 public:
     QSvgMask(QSvgNode *parent, QSvgRectF bounds,
-             QSvg::UnitTypes contentsUnits);
+             QtSvg::UnitTypes contentsUnits);
     void drawCommand(QPainter *, QSvgExtraStates &) override {};
     Type type() const override;
     QImage createMask(QPainter *p, QSvgExtraStates &states, QSvgNode *targetNode, QRectF *globalRect) const;
     QImage createMask(QPainter *p, QSvgExtraStates &states, const QRectF &localRect, QRectF *globalRect) const;
 private:
     QSvgRectF m_rect;
-    QSvg::UnitTypes m_contentUnits;
+    QtSvg::UnitTypes m_contentUnits;
 };
 
 class Q_SVG_EXPORT QSvgPattern : public QSvgStructureNode
 {
 public:
     QSvgPattern(QSvgNode *parent, QSvgRectF bounds, QRectF viewBox,
-                QSvg::UnitTypes contentUnits, QTransform transform);
+                QtSvg::UnitTypes contentUnits, QTransform transform);
     void drawCommand(QPainter *, QSvgExtraStates &) override {};
     QImage patternImage(QPainter *p, QSvgExtraStates &states, const QSvgNode *patternElement);
     Type type() const override;
@@ -217,7 +217,7 @@ private:
     QTransform m_appliedTransform;
     QSvgRectF m_rect;
     QRectF m_viewBox;
-    QSvg::UnitTypes m_contentUnits;
+    QtSvg::UnitTypes m_contentUnits;
     QTransform m_transform;
 };
 
diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp
index cdf2d3c..62e01d3 100644
--- a/src/svg/qsvgtinydocument.cpp
+++ b/src/svg/qsvgtinydocument.cpp
@@ -21,7 +21,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QSvgTinyDocument::QSvgTinyDocument(QSvg::FeatureSet featureSet)
+QSvgTinyDocument::QSvgTinyDocument(QtSvg::FeatureSet featureSet)
     : QSvgStructureNode(0)
     , m_widthPercent(false)
     , m_heightPercent(false)
@@ -153,7 +153,7 @@ static QByteArray qt_inflateSvgzDataFrom(QIODevice *)
 }
 #endif
 
-QSvgTinyDocument * QSvgTinyDocument::load(const QString &fileName, QSvg::FeatureSet featureSet)
+QSvgTinyDocument * QSvgTinyDocument::load(const QString &fileName, QtSvg::FeatureSet featureSet)
 {
     QFile file(fileName);
     if (!file.open(QFile::ReadOnly)) {
@@ -180,7 +180,7 @@ QSvgTinyDocument * QSvgTinyDocument::load(const QString &fileName, QSvg::Feature
     return doc;
 }
 
-QSvgTinyDocument * QSvgTinyDocument::load(const QByteArray &contents, QSvg::FeatureSet featureSet)
+QSvgTinyDocument * QSvgTinyDocument::load(const QByteArray &contents, QtSvg::FeatureSet featureSet)
 {
     QByteArray svg;
     // Check for gzip magic number and inflate if appropriate
@@ -209,7 +209,7 @@ QSvgTinyDocument * QSvgTinyDocument::load(const QByteArray &contents, QSvg::Feat
     return doc;
 }
 
-QSvgTinyDocument * QSvgTinyDocument::load(QXmlStreamReader *contents, QSvg::FeatureSet featureSet)
+QSvgTinyDocument * QSvgTinyDocument::load(QXmlStreamReader *contents, QtSvg::FeatureSet featureSet)
 {
     QSvgHandler handler(contents, featureSet);
 
@@ -340,7 +340,7 @@ void QSvgTinyDocument::setViewBox(const QRectF &rect)
     m_implicitViewBox = rect.isNull();
 }
 
-QSvg::FeatureSet QSvgTinyDocument::featureSet() const
+QtSvg::FeatureSet QSvgTinyDocument::featureSet() const
 {
     return m_featureSet;
 }
diff --git a/src/svg/qsvgtinydocument_p.h b/src/svg/qsvgtinydocument_p.h
index b6780ae..0b1c38c 100644
--- a/src/svg/qsvgtinydocument_p.h
+++ b/src/svg/qsvgtinydocument_p.h
@@ -36,11 +36,11 @@ class QTransform;
 class Q_SVG_EXPORT QSvgTinyDocument : public QSvgStructureNode
 {
 public:
-    static QSvgTinyDocument * load(const QString &file, QSvg::FeatureSet featureSet = QSvg::FeatureSet::AllAvailable);
-    static QSvgTinyDocument * load(const QByteArray &contents, QSvg::FeatureSet featureSet = QSvg::FeatureSet::AllAvailable);
-    static QSvgTinyDocument * load(QXmlStreamReader *contents, QSvg::FeatureSet featureSet = QSvg::FeatureSet::AllAvailable);
+    static QSvgTinyDocument * load(const QString &file, QtSvg::FeatureSet featureSet = QtSvg::FeatureSet::AllAvailable);
+    static QSvgTinyDocument * load(const QByteArray &contents, QtSvg::FeatureSet featureSet = QtSvg::FeatureSet::AllAvailable);
+    static QSvgTinyDocument * load(QXmlStreamReader *contents, QtSvg::FeatureSet featureSet = QtSvg::FeatureSet::AllAvailable);
 public:
-    QSvgTinyDocument(QSvg::FeatureSet featureSet);
+    QSvgTinyDocument(QtSvg::FeatureSet featureSet);
     ~QSvgTinyDocument();
     Type type() const override;
 
@@ -58,7 +58,7 @@ public:
     QRectF viewBox() const;
     void setViewBox(const QRectF &rect);
 
-    QSvg::FeatureSet featureSet() const;
+    QtSvg::FeatureSet featureSet() const;
 
     void drawCommand(QPainter *, QSvgExtraStates &) override;
 
@@ -109,7 +109,7 @@ private:
 
     QSvgExtraStates m_states;
 
-    const QSvg::FeatureSet m_featureSet;
+    const QtSvg::FeatureSet m_featureSet;
 };
 
 Q_SVG_EXPORT QDebug operator<<(QDebug debug, const QSvgTinyDocument &doc);
diff --git a/src/svg/qtsvgglobal.h b/src/svg/qtsvgglobal.h
index c67f07d..67ce37d 100644
--- a/src/svg/qtsvgglobal.h
+++ b/src/svg/qtsvgglobal.h
@@ -10,11 +10,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace QSvg {
+namespace QtSvg {
 
-enum class FeatureSet : quint32{
+enum class FeatureSet : quint32
+{
     StaticTiny1_2,
-    AllAvailable
+    AllAvailable = 0xffffffff,
 };
 
 }
diff --git a/src/svg/qtsvgglobal_p.h b/src/svg/qtsvgglobal_p.h
index cd73fbb..26cc72b 100644
--- a/src/svg/qtsvgglobal_p.h
+++ b/src/svg/qtsvgglobal_p.h
@@ -20,7 +20,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace QSvg {
+namespace QtSvg {
 
 enum class UnitTypes : quint32 {
     unknown,
diff --git a/src/svgwidgets/qsvgwidget.cpp b/src/svgwidgets/qsvgwidget.cpp
index da2ac45..698922f 100644
--- a/src/svgwidgets/qsvgwidget.cpp
+++ b/src/svgwidgets/qsvgwidget.cpp
@@ -129,11 +129,11 @@ QSize QSvgWidget::sizeHint() const
 /*!
     \since 6.7
 
-    Returns the QSvg::FeatureSet of the widget's renderer.
+    Returns the QtSvg::FeatureSet of the widget's renderer.
 
     \sa setFeatureSet
  */
-QSvg::FeatureSet QSvgWidget::featureSet() const
+QtSvg::FeatureSet QSvgWidget::featureSet() const
 {
     Q_D(const QSvgWidget);
     return d->renderer->featureSet();
@@ -142,17 +142,17 @@ QSvg::FeatureSet QSvgWidget::featureSet() const
 /*!
     \since 6.7
 
-    Sets the widget's renderer QSvg::FeatureSet to \a featureSet.
+    Sets the widget's renderer QtSvg::FeatureSet to \a featureSet.
 
-    If this function is used to set the QSvg::FeatureSet, it will
+    If this function is used to set the QtSvg::FeatureSet, it will
     control how QSvgWidget::loadrenderer is going to load the SVG file.
 
-    The default value of QSvg::FeatureSet in the renderer is
-    QSvg::AllAvailable.
+    The default value of QtSvg::FeatureSet in the renderer is
+    QtSvg::AllAvailable.
 
     \sa featureSet
  */
-void QSvgWidget::setFeatureSet(QSvg::FeatureSet featureSet)
+void QSvgWidget::setFeatureSet(QtSvg::FeatureSet featureSet)
 {
     Q_D(QSvgWidget);
     d->renderer->setFeatureSet(featureSet);
diff --git a/src/svgwidgets/qsvgwidget.h b/src/svgwidgets/qsvgwidget.h
index 3f79bed..ac12574 100644
--- a/src/svgwidgets/qsvgwidget.h
+++ b/src/svgwidgets/qsvgwidget.h
@@ -27,8 +27,8 @@ public:
 
     QSize sizeHint() const override;
 
-    QSvg::FeatureSet featureSet() const;
-    void setFeatureSet(QSvg::FeatureSet featureSet);
+    QtSvg::FeatureSet featureSet() const;
+    void setFeatureSet(QtSvg::FeatureSet featureSet);
 public Q_SLOTS:
     void load(const QString &file);
     void load(const QByteArray &contents);