diff --git a/autotests/extractorcollectiontest.cpp b/autotests/extractorcollectiontest.cpp --- a/autotests/extractorcollectiontest.cpp +++ b/autotests/extractorcollectiontest.cpp @@ -104,9 +104,16 @@ // Verify properties for every supported mimetype auto propMimetypesJson = exProperties["MimeTypes"]; +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) QSet propMimetypes = propMimetypesJson.toMap().keys().toSet(); QSet supportedMimetypes = extractor->mimetypes().toSet(); +#else + const QStringList propMimeList = propMimetypesJson.toMap().keys(); + QSet propMimetypes(propMimeList.begin(), propMimeList.end()); + const QStringList extractedMimes = extractor->mimetypes(); + QSet supportedMimetypes(extractedMimes.begin(), extractedMimes.end()); +#endif QVERIFY2(!exProperties["Name"].toString().isEmpty(), "Missing \"Name\" property"); QVERIFY2(!exProperties["Id"].toString().isEmpty(), "Missing \"Id\" property"); diff --git a/autotests/taglibextractortest.cpp b/autotests/taglibextractortest.cpp --- a/autotests/taglibextractortest.cpp +++ b/autotests/taglibextractortest.cpp @@ -581,8 +581,17 @@ const auto resultList = extracted.properties(); const auto resultKeys = resultList.uniqueKeys(); - const auto excessKeys = resultKeys.toSet() - expectedKeys.toSet(); - const auto missingKeys = expectedKeys.toSet() - resultKeys.toSet(); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + const QSet resultKeySet = resultKeys.toSet(); + const QSet expectedKeySet = expectedKeys.toSet(); +#else + const QSet resultKeySet(resultKeys.begin(), resultKeys.end()); + const QSet expectedKeySet(expectedKeys.begin(), expectedKeys.end()); +#endif + + const auto excessKeys = resultKeySet - expectedKeySet; + const auto missingKeys = expectedKeySet - resultKeySet; + if (!excessKeys.isEmpty()) { const auto propNames = propertyEnumNames(excessKeys.values()).join(QLatin1String(", ")); if (failMessage.isEmpty()) { @@ -598,7 +607,6 @@ } QCOMPARE(resultKeys, expectedKeys); if (!failMessage.isEmpty()) { - auto excessKeys = resultKeys.toSet() - expectedKeys.toSet(); const auto message = QStringLiteral("%1: %2") .arg(failMessage) .arg(propertyEnumNames(excessKeys.values()).join(QLatin1String(", ")));