Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I4bbe7513984fe00c90e5fa897c9eebab61d1dc5e

3 files changed, 2 insertions, 12 deletions

diff --git a/src/plugins/imageformats/svg/qsvgiohandler.cpp b/src/plugins/imageformats/svg/qsvgiohandler.cpp
index 6999d51..334c24b 100644
--- a/src/plugins/imageformats/svg/qsvgiohandler.cpp
+++ b/src/plugins/imageformats/svg/qsvgiohandler.cpp
@@ -140,13 +140,6 @@ bool QSvgIOHandler::canRead() const
     return false;
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-QByteArray QSvgIOHandler::name() const
-{
-    return "svg";
-}
-#endif
-
 bool QSvgIOHandler::read(QImage *image)
 {
     if (!d->readDone && d->load(device())) {
diff --git a/src/plugins/imageformats/svg/qsvgiohandler.h b/src/plugins/imageformats/svg/qsvgiohandler.h
index 5fdf6ee..5a952e1 100644
--- a/src/plugins/imageformats/svg/qsvgiohandler.h
+++ b/src/plugins/imageformats/svg/qsvgiohandler.h
@@ -58,9 +58,6 @@ public:
     QSvgIOHandler();
     ~QSvgIOHandler();
     bool canRead() const override;
-#if QT_DEPRECATED_SINCE(5, 13)
-    QByteArray name() const override;
-#endif
     bool read(QImage *image) override;
     static bool canRead(QIODevice *device);
     QVariant option(ImageOption option) const override;
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 64a2bdc..68929e3 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -2076,7 +2076,7 @@ static void cssStyleLookup(QSvgNode *node,
 
 static inline QStringList stringToList(const QString &str)
 {
-    QStringList lst = str.split(QLatin1Char(','), QString::SkipEmptyParts);
+    QStringList lst = str.split(QLatin1Char(','), Qt::SkipEmptyParts);
     return lst;
 }
 
@@ -3265,7 +3265,7 @@ static QSvgNode *createSvgNode(QSvgNode *parent,
         viewBoxStr = viewBoxStr.replace(QLatin1Char('\r'), QLatin1Char(','));
         viewBoxStr = viewBoxStr.replace(QLatin1Char('\n'), QLatin1Char(','));
         viewBoxStr = viewBoxStr.replace(QLatin1Char('\t'), QLatin1Char(','));
-        viewBoxValues = viewBoxStr.split(QLatin1Char(','), QString::SkipEmptyParts);
+        viewBoxValues = viewBoxStr.split(QLatin1Char(','), Qt::SkipEmptyParts);
     }
     if (viewBoxValues.count() == 4) {
         QString xStr      = viewBoxValues.at(0).trimmed();