Merge remote-tracking branch 'origin/wip/qt6' into dev

 Conflicts:
	.qmake.conf

Change-Id: I5568b3f8f2834f30e3ffa43f50c2f47ac9b66036

9 files changed, 21 insertions, 18 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 8f723f8..b50f513 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,4 @@ android|boot2qt: CONFIG -= headersclean
 
 DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
 
-MODULE_VERSION = 5.15.0
+MODULE_VERSION = 6.0.0
diff --git a/examples/script/qsdbg/scriptdebugger.cpp b/examples/script/qsdbg/scriptdebugger.cpp
index 62eb721..479c26d 100644
--- a/examples/script/qsdbg/scriptdebugger.cpp
+++ b/examples/script/qsdbg/scriptdebugger.cpp
@@ -256,13 +256,13 @@ void ScriptDebuggerPrivate::output(const QString &text)
 
 void ScriptDebuggerPrivate::message(const QString &text)
 {
-    *m_outputStream << text << endl;
+    *m_outputStream << text << Qt::endl;
     m_outputStream->flush();
 }
 
 void ScriptDebuggerPrivate::errorMessage(const QString &text)
 {
-    *m_errorStream << text << endl;
+    *m_errorStream << text << Qt::endl;
     m_errorStream->flush();
 }
 
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
diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
index 73a1575..55b1391 100644
--- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
+++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
@@ -353,12 +353,12 @@ void tst_QScriptJSTestSuite::configData(TestConfig::Mode mode, const QStringList
 
 void tst_QScriptJSTestSuite::writeSkipConfigFile(QTextStream &stream)
 {
-    stream << QString::fromLatin1("# testcase | message") << endl;
+    stream << QString::fromLatin1("# testcase | message") << Qt::endl;
 }
 
 void tst_QScriptJSTestSuite::writeExpectFailConfigFile(QTextStream &stream)
 {
-    stream << QString::fromLatin1("# testcase | description | message") << endl;
+    stream << QString::fromLatin1("# testcase | description | message") << Qt::endl;
     for (int i = 0; i < expectedFailures.size(); ++i) {
         const FailureItem &fail = expectedFailures.at(i);
         if (fail.pathRegExp.pattern().isEmpty())
@@ -368,7 +368,7 @@ void tst_QScriptJSTestSuite::writeExpectFailConfigFile(QTextStream &stream)
             .arg(escape(fail.description));
         if (!fail.message.isEmpty())
             stream << QString::fromLatin1(" | %0").arg(escape(fail.message));
-        stream << endl;
+        stream << Qt::endl;
     }
 }
 
diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
index c27e01e..6b1c14a 100644
--- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
+++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
@@ -94,12 +94,12 @@ static QScriptValue qscript_fail(QScriptContext *ctx, QScriptEngine *eng)
 
 void tst_QScriptV8TestSuite::writeSkipConfigFile(QTextStream &stream)
 {
-    stream << QString::fromLatin1("# testcase | message") << endl;
+    stream << QString::fromLatin1("# testcase | message") << Qt::endl;
 }
 
 void tst_QScriptV8TestSuite::writeExpectFailConfigFile(QTextStream &stream)
 {
-    stream << QString::fromLatin1("# testcase | actual | expected | message") << endl;
+    stream << QString::fromLatin1("# testcase | actual | expected | message") << Qt::endl;
     for (int i = 0; i < expectedFailures.size(); ++i) {
         const ExpectedFailure &fail = expectedFailures.at(i);
         stream << QString::fromLatin1("%0 | %1 | %2")
@@ -108,7 +108,7 @@ void tst_QScriptV8TestSuite::writeExpectFailConfigFile(QTextStream &stream)
             .arg(escape(fail.expected));
         if (!fail.message.isEmpty())
             stream << QString::fromLatin1(" | %0").arg(escape(fail.message));
-        stream << endl;
+        stream << Qt::endl;
     }
 }