summaryrefslogtreecommitdiff
path: root/utils/rbutilqt/test/test-playerbuildinfo.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2022-03-23 20:11:31 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2022-03-23 20:11:31 +0100
commit238cd13469935ec908b6d179839b7b7b435cb2be (patch)
tree986856a871bb21e2a38ed9ece27b6e00d5bf1746 /utils/rbutilqt/test/test-playerbuildinfo.cpp
parentf3b19de594bc68449fab0f42426e971bae2c7ad9 (diff)
downloadrockbox-238cd13469935ec908b6d179839b7b7b435cb2be.tar.gz
rockbox-238cd13469935ec908b6d179839b7b7b435cb2be.zip
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
Diffstat (limited to 'utils/rbutilqt/test/test-playerbuildinfo.cpp')
-rw-r--r--utils/rbutilqt/test/test-playerbuildinfo.cpp12
1 files changed, 6 insertions, 6 deletions
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()
212 212
213 RbSettings::setValue(RbSettings::CurrentPlatform, target); 213 RbSettings::setValue(RbSettings::CurrentPlatform, target);
214 QVariant result = PlayerBuildInfo::instance()->value(item, type); 214 QVariant result = PlayerBuildInfo::instance()->value(item, type);
215 if(result.canConvert(QMetaType::QString)) 215 if(result.canConvert(QMetaType::QStringList))
216 QCOMPARE(result.toString(), QString(expected));
217 else
218 QCOMPARE(result.toStringList().join(","), QString(expected)); 216 QCOMPARE(result.toStringList().join(","), QString(expected));
217 else
218 QCOMPARE(result.toString(), QString(expected));
219} 219}
220 220
221 221
@@ -252,10 +252,10 @@ void TestPlayerBuildInfo::testPlayerInfo()
252 QFETCH(QString, expected); 252 QFETCH(QString, expected);
253 253
254 QVariant result = PlayerBuildInfo::instance()->value(item, target); 254 QVariant result = PlayerBuildInfo::instance()->value(item, target);
255 if(result.canConvert(QMetaType::QString)) 255 if(result.canConvert(QMetaType::QStringList))
256 QCOMPARE(result.toString(), QString(expected));
257 else
258 QCOMPARE(result.toStringList().join(","), QString(expected)); 256 QCOMPARE(result.toStringList().join(","), QString(expected));
257 else
258 QCOMPARE(result.toString(), QString(expected));
259} 259}
260 260
261 261