From 1847b068b54286f229efdfe7dff9bff8ec869fc4 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Sun, 12 Jan 2020 18:42:58 +0200
Subject: [PATCH] Fix deprecation warnings.

--HG--
branch : develop
---
 .../vtools/undocommands/savepieceoptions.cpp     | 16 +++++++++++-----
 .../vtools/undocommands/savepiecepathoptions.cpp | 16 +++++++++++-----
 src/test/TranslationsTest/tst_abstractregexp.cpp |  6 +++++-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/libs/vtools/undocommands/savepieceoptions.cpp b/src/libs/vtools/undocommands/savepieceoptions.cpp
index a0fc4849c..5260961dc 100644
--- a/src/libs/vtools/undocommands/savepieceoptions.cpp
+++ b/src/libs/vtools/undocommands/savepieceoptions.cpp
@@ -160,12 +160,18 @@ bool SavePieceOptions::mergeWith(const QUndoCommand *command)
     }
     else
     {
-        const QSet<quint32> currentSet;
-        currentSet.fromList(m_newDet.Dependencies());
-
         const VPiece candidate = saveCommand->NewDet();
-        const QSet<quint32> candidateSet;
-        candidateSet.fromList(candidate.Dependencies());
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        QList<quint32> currentDependencies = m_newDet.Dependencies();
+        QList<quint32> candidateDependencies = candidate.Dependencies();
+
+        auto currentSet = QSet<quint32>(currentDependencies.begin(), currentDependencies.end());
+        auto candidateSet = QSet<quint32>(candidateDependencies.begin(), candidateDependencies.end());
+#else
+        auto currentSet = QSet<quint32>::fromList(m_newDet.Dependencies());
+        auto candidateSet = QSet<quint32>::fromList(candidate.Dependencies());
+#endif
 
         if (currentSet != candidateSet)
         {
diff --git a/src/libs/vtools/undocommands/savepiecepathoptions.cpp b/src/libs/vtools/undocommands/savepiecepathoptions.cpp
index 7c4c57a9b..28e7d0669 100644
--- a/src/libs/vtools/undocommands/savepiecepathoptions.cpp
+++ b/src/libs/vtools/undocommands/savepiecepathoptions.cpp
@@ -127,12 +127,18 @@ bool SavePiecePathOptions::mergeWith(const QUndoCommand *command)
     }
     else
     {
-        const QSet<quint32> currentSet;
-        currentSet.fromList(m_newPath.Dependencies());
-
         const VPiecePath candidate = saveCommand->NewPath();
-        const QSet<quint32> candidateSet;
-        candidateSet.fromList(candidate.Dependencies());
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        QList<quint32> currentDependencies = m_newPath.Dependencies();
+        QList<quint32> candidateDependencies = candidate.Dependencies();
+
+        auto currentSet = QSet<quint32>(currentDependencies.begin(), currentDependencies.end());
+        auto candidateSet = QSet<quint32>(candidateDependencies.begin(), candidateDependencies.end());
+#else
+        auto currentSet = QSet<quint32>::fromList(m_newPath.Dependencies());
+        auto candidateSet = QSet<quint32>::fromList(candidate.Dependencies());
+#endif
 
         if (currentSet != candidateSet)
         {
diff --git a/src/test/TranslationsTest/tst_abstractregexp.cpp b/src/test/TranslationsTest/tst_abstractregexp.cpp
index 4e2acf56e..24664ee9a 100644
--- a/src/test/TranslationsTest/tst_abstractregexp.cpp
+++ b/src/test/TranslationsTest/tst_abstractregexp.cpp
@@ -185,7 +185,11 @@ void TST_AbstractRegExp::CallTestCheckNoOriginalNamesInTranslation()
     QFETCH(QString, originalName);
 
     static const QStringList originalNames = AllNames();
-    static const QSet<QString> names = QSet<QString>::fromList(originalNames);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    static const auto names = QSet<QString>(originalNames.begin(), originalNames.end());
+#else
+    static const auto names = QSet<QString>::fromList(originalNames);
+#endif
 
     const QString translated = m_trMs->VarToUser(originalName);
     if (names.contains(translated))