diff options
| author | Richard Weickelt <richard@weickelt.de> | 2020-05-28 01:08:40 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2020-07-20 21:04:44 +0000 |
| commit | 7401a6bc4e53d920fd7ced3249c735fd232d191c (patch) | |
| tree | 0a95b1cd4a6944d578645707336383b0087f1f19 /tests/auto/blackbox/tst_blackboxapple.cpp | |
| parent | 91ca67815af4512004d11a582753d4e6980e2004 (diff) | |
Switch to Qt 5.15.0 and drop CI support for MinGW on Linux
Cross-builds with MinGW on Linux are dropped mainly because of build
issues and because MinGW support bloats the resulting Docker image. We
have CI jobs running on Windows with MSVC and Clang-cl which should be
sufficient.
Change-Id: Iac4e0eaf1270844836697bebf52f9c056457caaf
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxapple.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxapple.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp index 87bea9ae5..786dba432 100644 --- a/tests/auto/blackbox/tst_blackboxapple.cpp +++ b/tests/auto/blackbox/tst_blackboxapple.cpp @@ -855,8 +855,9 @@ void TestBlackboxApple::infoPlist() // QBS-1447: UIDeviceFamily was set to a string instead of an array const auto family = content.value(QStringLiteral("UIDeviceFamily")); if (family.isValid()) { - // int gets converted to a double when exporting plist as JSON - QVERIFY(testVariantListType(family, QMetaType::Double)); + // Prior to Qt 5.15, int gets converted to a double when exporting plist as JSON + QVERIFY(testVariantListType(family, QMetaType::LongLong) + || testVariantListType(family, QMetaType::Double)); } const auto caps = content.value(QStringLiteral("UIRequiredDeviceCapabilities")); if (caps.isValid()) |