From 5c7733d5c5564a64468c5fdd5e8bd29cc131784c Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Wed, 10 Jul 2019 18:43:23 +0200
Subject: Bump Qt version to Qt 6

And also fix usages of removed API.

Change-Id: Ifbbe08a202ed19b5969781f66240174ef816269e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 .qmake.conf                                                  | 2 +-
 src/script/api/qscriptengine.cpp                             | 4 ++--
 src/scripttools/debugging/qscriptdebuggeragent.cpp           | 8 +++++---
 src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp | 2 +-
 src/scripttools/debugging/qscriptobjectsnapshot.cpp          | 5 +++--
 src/scripttools/debugging/qscriptxmlparser.cpp               | 2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.qmake.conf b/.qmake.conf
index a555316..d60abaf 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,4 @@ android|boot2qt: CONFIG -= headersclean
 
 DEFINES += QT_NO_FOREACH
 
-MODULE_VERSION = 5.14.0
+MODULE_VERSION = 6.0.0
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 5bd399f..abb04d5 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -3847,7 +3847,7 @@ QStringList QScriptEngine::availableExtensions() const
         }
     }
 
-    QStringList lst = result.toList();
+    QStringList lst = result.values();
     std::sort(lst.begin(), lst.end());
     return lst;
 #endif
@@ -3864,7 +3864,7 @@ QStringList QScriptEngine::availableExtensions() const
 QStringList QScriptEngine::importedExtensions() const
 {
     Q_D(const QScriptEngine);
-    QStringList lst = d->importedExtensions.toList();
+    QStringList lst = d->importedExtensions.values();
     std::sort(lst.begin(), lst.end());
     return lst;
 }
diff --git a/src/scripttools/debugging/qscriptdebuggeragent.cpp b/src/scripttools/debugging/qscriptdebuggeragent.cpp
index 7e25304..81ffb64 100644
--- a/src/scripttools/debugging/qscriptdebuggeragent.cpp
+++ b/src/scripttools/debugging/qscriptdebuggeragent.cpp
@@ -394,11 +394,13 @@ void QScriptDebuggerAgent::scriptsCheckpoint()
 QPair<QList<qint64>, QList<qint64> > QScriptDebuggerAgent::scriptsDelta() const
 {
     Q_D(const QScriptDebuggerAgent);
-    QSet<qint64> prevSet = d->previousCheckpointScripts.keys().toSet();
-    QSet<qint64> currSet = d->checkpointScripts.keys().toSet();
+    QList<qint64> prevKeys = d->previousCheckpointScripts.keys();
+    QList<qint64> currKeys = d->checkpointScripts.keys();
+    QSet<qint64> prevSet = QSet<qint64>(prevKeys.begin(), prevKeys.end());
+    QSet<qint64> currSet = QSet<qint64>(currKeys.begin(), currKeys.end());
     QSet<qint64> addedScriptIds = currSet - prevSet;
     QSet<qint64> removedScriptIds = prevSet - currSet;
-    return qMakePair(addedScriptIds.toList(), removedScriptIds.toList());
+    return qMakePair(addedScriptIds.values(), removedScriptIds.values());
 }
 
 /*!
diff --git a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
index c71d0b0..ab0bc24 100644
--- a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
@@ -398,7 +398,7 @@ QScriptDebuggerResponse QScriptDebuggerCommandExecutor::execute(
                 obj = obj.prototype();
             }
         }
-        QStringList matchesList = matches.toList();
+        QStringList matchesList = matches.values();
         std::stable_sort(matchesList.begin(), matchesList.end());
         response.setResult(matchesList);
     }   break;
diff --git a/src/scripttools/debugging/qscriptobjectsnapshot.cpp b/src/scripttools/debugging/qscriptobjectsnapshot.cpp
index 50eee7d..c2e68ab 100644
--- a/src/scripttools/debugging/qscriptobjectsnapshot.cpp
+++ b/src/scripttools/debugging/qscriptobjectsnapshot.cpp
@@ -93,7 +93,8 @@ QScriptObjectSnapshot::Delta QScriptObjectSnapshot::capture(const QScriptValue &
     QSet<QString> prevSet;
     for (int i = 0; i < m_properties.size(); ++i)
         prevSet.insert(m_properties.at(i).name());
-    QSet<QString> currSet = currProps.keys().toSet();
+    QList<QString> currPropsKeys = currProps.keys();
+    QSet<QString> currSet = QSet<QString>(currPropsKeys.begin(), currPropsKeys.end());
     QSet<QString> removedProperties = prevSet - currSet;
     QSet<QString> addedProperties = currSet - prevSet;
     QSet<QString> maybeChangedProperties = currSet & prevSet;
@@ -120,7 +121,7 @@ QScriptObjectSnapshot::Delta QScriptObjectSnapshot::capture(const QScriptValue &
         }
     }
 
-    result.removedProperties = removedProperties.toList();
+    result.removedProperties = removedProperties.values();
 
     m_properties = currProps.values();
 
diff --git a/src/scripttools/debugging/qscriptxmlparser.cpp b/src/scripttools/debugging/qscriptxmlparser.cpp
index 2cf8c85..a29b69e 100644
--- a/src/scripttools/debugging/qscriptxmlparser.cpp
+++ b/src/scripttools/debugging/qscriptxmlparser.cpp
@@ -168,7 +168,7 @@ QScriptXmlParser::Result QScriptXmlParser::parse(const QString &xml)
     reader.readNext(); // </program>
     reader.readNext(); // EndDocument
     Q_ASSERT(reader.atEnd());
-    return Result(functionsInfo, lineNumbers.toSet());
+    return Result(functionsInfo, QSet<int>(lineNumbers.begin(), lineNumbers.end()));
 }
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3