Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-lottie for openSUSE:Factory checked in at 2024-04-08 17:39:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-lottie (Old) and /work/SRC/openSUSE:Factory/.qt6-lottie.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-lottie" Mon Apr 8 17:39:00 2024 rev:26 rq:1165788 version:6.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-lottie/qt6-lottie.changes 2024-03-28 14:21:39.473697961 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-lottie.new.1905/qt6-lottie.changes 2024-04-08 17:51:18.755560889 +0200 @@ -1,0 +2,6 @@ +Tue Apr 2 13:39:44 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 6.7.0: + * https://www.qt.io/blog/qt-6.7-released + +------------------------------------------------------------------- Old: ---- qtlottie-everywhere-src-6.6.3.tar.xz New: ---- qtlottie-everywhere-src-6.7.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-lottie.spec ++++++ --- /var/tmp/diff_new_pack.u4r8nO/_old 2024-04-08 17:51:19.835600752 +0200 +++ /var/tmp/diff_new_pack.u4r8nO/_new 2024-04-08 17:51:19.835600752 +0200 @@ -16,8 +16,8 @@ # -%define real_version 6.6.3 -%define short_version 6.6 +%define real_version 6.7.0 +%define short_version 6.7 %define short_name qtlottie %define tar_name qtlottie-everywhere-src %define tar_suffix %{nil} @@ -28,7 +28,7 @@ %endif # Name: qt6-lottie%{?pkg_suffix} -Version: 6.6.3 +Version: 6.7.0 Release: 0 Summary: QML API for rendering graphics and animation # LICENSE.GPL3-EXCEPT only applies to the conan recipe which is not used ++++++ qtlottie-everywhere-src-6.6.3.tar.xz -> qtlottie-everywhere-src-6.7.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/.cmake.conf new/qtlottie-everywhere-src-6.7.0/.cmake.conf --- old/qtlottie-everywhere-src-6.6.3/.cmake.conf 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/.cmake.conf 2024-03-22 19:50:58.000000000 +0100 @@ -1,3 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.6.3") +set(QT_REPO_MODULE_VERSION "6.7.0") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") +list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/.tag new/qtlottie-everywhere-src-6.7.0/.tag --- old/qtlottie-everywhere-src-6.6.3/.tag 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/.tag 2024-03-22 19:50:58.000000000 +0100 @@ -1 +1 @@ -f8a0df02d394e0a7bf06620da79f22c164e40c30 +5a8235d0a0cba5e2ebeec189dcc7b43c48eaa567 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/coin/axivion/ci_config_linux.json new/qtlottie-everywhere-src-6.7.0/coin/axivion/ci_config_linux.json --- old/qtlottie-everywhere-src-6.6.3/coin/axivion/ci_config_linux.json 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/coin/axivion/ci_config_linux.json 2024-03-22 19:50:58.000000000 +0100 @@ -1,9 +1,5 @@ { "Project": { - "Git": { - "_active": true, - "sourceserver_gitdir": "/data/axivion/databases/$(env:TESTED_MODULE_COIN).git" - }, "BuildSystemIntegration": { "child_order": [ "GCCSetup", @@ -32,29 +28,14 @@ "build/qml/*/*/*/lib*.so*.ir" ], "ir": "build/$(env:TESTED_MODULE_COIN).ir" - }, - "Project-GlobalOptions": { - "directory": "../work/qt/$(env:TESTED_MODULE_COIN)", - "ir": "build/$(env:TESTED_MODULE_COIN).ir", - "name": "qt_$(env:TESTED_MODULE_COIN)_dev_$(env:TARGET_OS_COIN)" - } - }, - "Results": { - "Dashboard": { - "dashboard_url": "https://axivion-srv.ci.qt.io/axivion/"; - }, - "Database": { - "ci_mode": { - "directory": "/data/axivion/databases" - } } }, "_Format": "1.0", - "_Version": "trunk-9e0ef9c5818", + "_Version": "7.6.2", "_VersionNum": [ 7, 6, - 9999, - 11489 + 2, + 12725 ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/dependencies.yaml new/qtlottie-everywhere-src-6.7.0/dependencies.yaml --- old/qtlottie-everywhere-src-6.6.3/dependencies.yaml 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/dependencies.yaml 2024-03-22 19:50:58.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: afdec885058c92e24604f398a926297222da06f3 + ref: 98602c26fc97eb41e3dd7548194ca637420a31b9 required: true ../qtdeclarative: - ref: ab5521fd1a637739c7e91def84caa84426055aff + ref: e6d14fcdc95713f65367499629f93fb1f1e35ec9 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/src/imports/lottieanimation.cpp new/qtlottie-everywhere-src-6.7.0/src/imports/lottieanimation.cpp --- old/qtlottie-everywhere-src-6.6.3/src/imports/lottieanimation.cpp 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/src/imports/lottieanimation.cpp 2024-03-22 19:50:58.000000000 +0100 @@ -26,6 +26,8 @@ #include "rasterrenderer/batchrenderer.h" #include "rasterrenderer/lottierasterrenderer.h" +using namespace Qt::StringLiterals; + QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(lcLottieQtBodymovinRender, "qt.lottieqt.bodymovin.render"); @@ -660,11 +662,7 @@ if (Q_UNLIKELY(rootObj.empty())) return -1; - QStringList versionString = rootObj.value(QLatin1String("v")).toString().split(u'.'); - QList<int> version; - foreach (QString v, versionString) - version.append(v.toInt()); - m_version = QVersionNumber(version); + m_version = QVersionNumber::fromString(rootObj.value("v"_L1).toString()); int startFrame = rootObj.value(QLatin1String("ip")).toVariant().toInt(); int endFrame = rootObj.value(QLatin1String("op")).toVariant().toInt(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/sync.profile new/qtlottie-everywhere-src-6.7.0/sync.profile --- old/qtlottie-everywhere-src-6.6.3/sync.profile 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/sync.profile 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -%modules = ( # path to module name map - "QtBodymovin" => "$basedir/src/bodymovin", -); - -%moduleheaders = ( # restrict the module headers to those found in relative path -); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/ellipse/tst_bmellipse.cpp new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/ellipse/tst_bmellipse.cpp --- old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/ellipse/tst_bmellipse.cpp 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/ellipse/tst_bmellipse.cpp 2024-03-22 19:50:58.000000000 +0100 @@ -11,6 +11,8 @@ #include "private/bmlayer_p.h" #include "private/bmellipse_p.h" +using namespace Qt::StringLiterals; + class tst_BMEllipse: public QObject { Q_OBJECT @@ -257,11 +259,7 @@ if (rootObj.empty()) QFAIL("Cannot parse test file"); - QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.'); - QList<int> vi; - foreach (QString v, vs) - vi.append(v.toInt()); - QVersionNumber version = QVersionNumber(vi); + const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString()); QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray(); QJsonObject layerObj = layers[0].toObject(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/fill/tst_bmfill.cpp new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/fill/tst_bmfill.cpp --- old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/fill/tst_bmfill.cpp 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/fill/tst_bmfill.cpp 2024-03-22 19:50:58.000000000 +0100 @@ -11,6 +11,8 @@ #include "private/bmlayer_p.h" #include "private/bmfill_p.h" +using namespace Qt::StringLiterals; + class tst_BMFill: public QObject { Q_OBJECT @@ -178,11 +180,7 @@ if (rootObj.empty()) QFAIL("Cannot parse test file"); - QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.'); - QList<int> vi; - foreach (QString v, vs) - vi.append(v.toInt()); - QVersionNumber version = QVersionNumber(vi); + const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString()); QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray(); QJsonObject layerObj = layers[0].toObject(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/path/tst_bmpath.cpp new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/path/tst_bmpath.cpp --- old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/path/tst_bmpath.cpp 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/path/tst_bmpath.cpp 2024-03-22 19:50:58.000000000 +0100 @@ -11,6 +11,8 @@ #include "private/bmlayer_p.h" #include "private/bmfreeformshape_p.h" +using namespace Qt::StringLiterals; + class tst_BMPath: public QObject { Q_OBJECT @@ -1106,11 +1108,7 @@ if (rootObj.empty()) QFAIL("Cannot parse test file"); - QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.'); - QList<int> vi; - foreach (QString v, vs) - vi.append(v.toInt()); - QVersionNumber version = QVersionNumber(vi); + const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString()); QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray(); QJsonObject layerObj = layers[0].toObject(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/rect/tst_bmrect.cpp new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/rect/tst_bmrect.cpp --- old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/rect/tst_bmrect.cpp 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/rect/tst_bmrect.cpp 2024-03-22 19:50:58.000000000 +0100 @@ -11,6 +11,8 @@ #include "private/bmlayer_p.h" #include "private/bmrect_p.h" +using namespace Qt::StringLiterals; + class tst_BMRect: public QObject { Q_OBJECT @@ -291,11 +293,7 @@ if (rootObj.empty()) QFAIL("Cannot parse test file"); - QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.'); - QList<int> vi; - foreach (QString v, vs) - vi.append(v.toInt()); - QVersionNumber version = QVersionNumber(vi); + const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString()); QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray(); QJsonObject layerObj = layers[0].toObject(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/repeater/tst_bmrepeater.cpp new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/repeater/tst_bmrepeater.cpp --- old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/repeater/tst_bmrepeater.cpp 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/repeater/tst_bmrepeater.cpp 2024-03-22 19:50:58.000000000 +0100 @@ -11,6 +11,8 @@ #include "private/bmlayer_p.h" #include "private/bmrepeater_p.h" +using namespace Qt::StringLiterals; + class tst_BMRepeater : public QObject { Q_OBJECT @@ -173,11 +175,7 @@ if (rootObj.empty()) QFAIL("Cannot parse test file"); - QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.'); - QList<int> vi; - foreach (QString v, vs) - vi.append(v.toInt()); - QVersionNumber version = QVersionNumber(vi); + const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString()); QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray(); QJsonObject layerObj = layers[0].toObject(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/repeatertransform/tst_bmrepeatertransform.cpp new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/repeatertransform/tst_bmrepeatertransform.cpp --- old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/repeatertransform/tst_bmrepeatertransform.cpp 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/repeatertransform/tst_bmrepeatertransform.cpp 2024-03-22 19:50:58.000000000 +0100 @@ -12,6 +12,8 @@ #include "private/bmrepeater_p.h" #include "private/bmrepeatertransform_p.h" +using namespace Qt::StringLiterals; + class tst_BMRepeaterTransform: public QObject { Q_OBJECT @@ -402,11 +404,7 @@ if (rootObj.empty()) QFAIL("Cannot parse test file"); - QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.'); - QList<int> vi; - foreach (QString v, vs) - vi.append(v.toInt()); - QVersionNumber version = QVersionNumber(vi); + const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString()); QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray(); QJsonObject layerObj = layers[0].toObject(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/shapelayer/tst_bmshapelayer.cpp new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/shapelayer/tst_bmshapelayer.cpp --- old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/shapelayer/tst_bmshapelayer.cpp 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/shapelayer/tst_bmshapelayer.cpp 2024-03-22 19:50:58.000000000 +0100 @@ -11,6 +11,8 @@ #include "private/bmlayer_p.h" #include "private/bmshapelayer_p.h" +using namespace Qt::StringLiterals; + class tst_BMShapeLayer: public QObject { Q_OBJECT @@ -146,11 +148,7 @@ if (rootObj.empty()) QFAIL("Cannot parse test file"); - QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.'); - QList<int> vi; - foreach (QString v, vs) - vi.append(v.toInt()); - QVersionNumber version = QVersionNumber(vi); + const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString()); m_width = rootObj.value(QLatin1String("w")).toVariant().toReal(); m_height = rootObj.value(QLatin1String("h")).toVariant().toReal(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/shapetransform/tst_bmshapetransform.cpp new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/shapetransform/tst_bmshapetransform.cpp --- old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/shapetransform/tst_bmshapetransform.cpp 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/shapetransform/tst_bmshapetransform.cpp 2024-03-22 19:50:58.000000000 +0100 @@ -12,6 +12,8 @@ #include "private/bmgroup_p.h" #include "private/bmshapetransform_p.h" +using namespace Qt::StringLiterals; + class tst_BMShapeTransform: public QObject { Q_OBJECT @@ -458,11 +460,7 @@ if (type != 4) QFAIL("It's not shape layer"); - QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.'); - QList<int> vi; - foreach (QString v, vs) - vi.append(v.toInt()); - QVersionNumber version = QVersionNumber(vi); + const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString()); QJsonArray shapes = layerObj.value(QLatin1String("shapes")).toArray(); QJsonArray::const_iterator shapesIt = shapes.constBegin(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/stroke/tst_bmstroke.cpp new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/stroke/tst_bmstroke.cpp --- old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/stroke/tst_bmstroke.cpp 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/stroke/tst_bmstroke.cpp 2024-03-22 19:50:58.000000000 +0100 @@ -11,6 +11,8 @@ #include "private/bmlayer_p.h" #include "private/bmstroke_p.h" +using namespace Qt::StringLiterals; + class tst_BMStroke: public QObject { Q_OBJECT @@ -291,11 +293,7 @@ if (rootObj.empty()) QFAIL("Cannot parse test file"); - QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.'); - QList<int> vi; - foreach (QString v, vs) - vi.append(v.toInt()); - QVersionNumber version = QVersionNumber(vi); + const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString()); QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray(); QJsonObject layerObj = layers[0].toObject(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/transform/tst_bmbasictransform.cpp new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/transform/tst_bmbasictransform.cpp --- old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/transform/tst_bmbasictransform.cpp 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/transform/tst_bmbasictransform.cpp 2024-03-22 19:50:58.000000000 +0100 @@ -11,6 +11,8 @@ #include "private/bmlayer_p.h" #include "private/bmbasictransform_p.h" +using namespace Qt::StringLiterals; + class tst_BMBasicTransform: public QObject { Q_OBJECT @@ -366,11 +368,7 @@ if (rootObj.empty()) QFAIL("Cannot parse test file"); - QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.'); - QList<int> vi; - foreach (QString v, vs) - vi.append(v.toInt()); - QVersionNumber version = QVersionNumber(vi); + const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString()); QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray(); QJsonObject layerObj = layers[0].toObject(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/trimpath/tst_bmtrimpath.cpp new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/trimpath/tst_bmtrimpath.cpp --- old/qtlottie-everywhere-src-6.6.3/tests/auto/bodymovin/shape/trimpath/tst_bmtrimpath.cpp 2024-03-19 00:53:01.000000000 +0100 +++ new/qtlottie-everywhere-src-6.7.0/tests/auto/bodymovin/shape/trimpath/tst_bmtrimpath.cpp 2024-03-22 19:50:58.000000000 +0100 @@ -11,6 +11,8 @@ #include "private/bmlayer_p.h" #include "private/bmtrimpath_p.h" +using namespace Qt::StringLiterals; + class tst_BMTrimPath: public QObject { Q_OBJECT @@ -253,11 +255,7 @@ if (rootObj.empty()) QFAIL("Cannot parse test file"); - QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.'); - QList<int> vi; - foreach (QString v, vs) - vi.append(v.toInt()); - QVersionNumber version = QVersionNumber(vi); + const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString()); QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray(); QJsonObject layerObj = layers[0].toObject();
