From 238cd13469935ec908b6d179839b7b7b435cb2be Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Wed, 23 Mar 2022 20:11:31 +0100 Subject: rbutil: Fix build info list handling with Qt6. With Qt6 we need to check the type differently or we'd convert a stringlist to a string. Change-Id: I00a7a73535503b97f40edb51099a332902e881e0 --- utils/rbutilqt/test/test-playerbuildinfo.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'utils/rbutilqt/test/test-playerbuildinfo.cpp') diff --git a/utils/rbutilqt/test/test-playerbuildinfo.cpp b/utils/rbutilqt/test/test-playerbuildinfo.cpp index de81b36a30..281f2682e9 100644 --- a/utils/rbutilqt/test/test-playerbuildinfo.cpp +++ b/utils/rbutilqt/test/test-playerbuildinfo.cpp @@ -212,10 +212,10 @@ void TestPlayerBuildInfo::testBuildInfo() RbSettings::setValue(RbSettings::CurrentPlatform, target); QVariant result = PlayerBuildInfo::instance()->value(item, type); - if(result.canConvert(QMetaType::QString)) - QCOMPARE(result.toString(), QString(expected)); - else + if(result.canConvert(QMetaType::QStringList)) QCOMPARE(result.toStringList().join(","), QString(expected)); + else + QCOMPARE(result.toString(), QString(expected)); } @@ -252,10 +252,10 @@ void TestPlayerBuildInfo::testPlayerInfo() QFETCH(QString, expected); QVariant result = PlayerBuildInfo::instance()->value(item, target); - if(result.canConvert(QMetaType::QString)) - QCOMPARE(result.toString(), QString(expected)); - else + if(result.canConvert(QMetaType::QStringList)) QCOMPARE(result.toStringList().join(","), QString(expected)); + else + QCOMPARE(result.toString(), QString(expected)); } -- cgit v1.2.3