Replace use of QSet::fromList with Qt 5.14 and above

2019-12-21 18:22:18 +01:00
parent 6df38c389c
commit be9bf5c173
4 changed files with 17 additions and 1 deletions
--- a/src/musicbrainz/musicbrainzclient.cpp
+++ b/src/musicbrainz/musicbrainzclient.cpp
@@ -488,7 +488,11 @@ MusicBrainzClient::ResultList MusicBrainzClient::UniqueResults(const ResultList&

  ResultList ret;
  if (opt == SortResults) {
-    ret = QSet<Result>::fromList(results).toList();
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+    ret = QSet<Result>(results.begin(), results.end()).values();
+#else
+    ret = QSet<Result>::fromList(results).values();
+#endif
    std::sort(ret.begin(), ret.end());
  }
  else {  // KeepOriginalOrder