diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-05 16:19:54 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-05 16:19:54 +0100 |
commit | 15446fabdb5cf53deba23c5604dc8afe8e52e2ac (patch) | |
tree | 87eb151afea9ed147db099c747b7d64ca7aa896e /src/svg | |
parent | 7eda6fa5829950a7db334da2626c9d9db45befa8 (diff) | |
parent | 215a6642a48b1272a54ce2d125346fa0b8c89847 (diff) | |
download | qtsvg-15446fabdb5cf53deba23c5604dc8afe8e52e2ac.tar.gz |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I4bbe7513984fe00c90e5fa897c9eebab61d1dc5e
Diffstat (limited to 'src/svg')
-rw-r--r-- | src/svg/qsvghandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |