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

 Conflicts:
	.qmake.conf

Change-Id: I6a25cd3cb2ae94cea140b37838e3fda70f22282b

4 files changed, 41 insertions, 37 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 21f7866..8f0d082 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -4,6 +4,6 @@ CONFIG += qt_example_installs
 DEFINES += QT_NO_JAVA_STYLE_ITERATORS
 DEFINES += QT_NO_FOREACH
 
-MODULE_VERSION = 5.15.0
+MODULE_VERSION = 6.0.0
 
 QTRO_SOURCE_TREE = $$PWD
diff --git a/src/imports/remoteobjects/plugin.cpp b/src/imports/remoteobjects/plugin.cpp
index 4032a63..43a25bd 100644
--- a/src/imports/remoteobjects/plugin.cpp
+++ b/src/imports/remoteobjects/plugin.cpp
@@ -131,7 +131,9 @@ class QtRemoteObjectsPlugin : public QQmlExtensionPlugin
 public:
     void registerTypes(const char *uri) override
     {
-        qmlRegisterModule(uri, 5, QT_VERSION_MINOR);
+        // The minor version used to be the current Qt 5 minor. For compatibility it is the last
+        // Qt 5 release.
+        qmlRegisterModule(uri, 5, 15);
 
         qmlRegisterUncreatableType<QRemoteObjectAbstractPersistedStore>(uri, 5, 12, "PersistedStore", "Cannot create PersistedStore");
 
diff --git a/tests/auto/repparser/tst_parser.cpp b/tests/auto/repparser/tst_parser.cpp
index b749a15..e082a1a 100644
--- a/tests/auto/repparser/tst_parser.cpp
+++ b/tests/auto/repparser/tst_parser.cpp
@@ -82,7 +82,7 @@ void tst_Parser::testBasic()
     QTemporaryFile file;
     file.open();
     QTextStream stream(&file);
-    stream << content << endl;
+    stream << content << Qt::endl;
     file.seek(0);
 
     RepParser parser(file);
@@ -142,10 +142,10 @@ void tst_Parser::testProperties()
     QTemporaryFile file;
     file.open();
     QTextStream stream(&file);
-    stream << "class TestClass" << endl;
-    stream << "{" << endl;
-    stream << propertyDeclaration << endl;
-    stream << "};" << endl;
+    stream << "class TestClass" << Qt::endl;
+    stream << "{" << Qt::endl;
+    stream << propertyDeclaration << Qt::endl;
+    stream << "};" << Qt::endl;
     file.seek(0);
 
     RepParser parser(file);
@@ -195,10 +195,10 @@ void tst_Parser::testSlots()
     QTemporaryFile file;
     file.open();
     QTextStream stream(&file);
-    stream << "class TestClass" << endl;
-    stream << "{" << endl;
-    stream << slotDeclaration << endl;
-    stream << "};" << endl;
+    stream << "class TestClass" << Qt::endl;
+    stream << "{" << Qt::endl;
+    stream << slotDeclaration << Qt::endl;
+    stream << "};" << Qt::endl;
     file.seek(0);
 
     if (voidWarning)
@@ -237,10 +237,10 @@ void tst_Parser::testSignals()
     QTemporaryFile file;
     file.open();
     QTextStream stream(&file);
-    stream << "class TestClass" << endl;
-    stream << "{" << endl;
-    stream << signalDeclaration << endl;
-    stream << "};" << endl;
+    stream << "class TestClass" << Qt::endl;
+    stream << "{" << Qt::endl;
+    stream << signalDeclaration << Qt::endl;
+    stream << "};" << Qt::endl;
     file.seek(0);
 
     RepParser parser(file);
@@ -283,10 +283,10 @@ void tst_Parser::testPods()
     QTemporaryFile file;
     file.open();
     QTextStream stream(&file);
-    stream << podsdeclaration << endl;
-    stream << "class TestClass" << endl;
-    stream << "{" << endl;
-    stream << "};" << endl;
+    stream << podsdeclaration << Qt::endl;
+    stream << "class TestClass" << Qt::endl;
+    stream << "{" << Qt::endl;
+    stream << "};" << Qt::endl;
     file.seek(0);
 
     RepParser parser(file);
@@ -347,12 +347,12 @@ void tst_Parser::testEnums()
     file.open();
     QTextStream stream(&file);
     if (!inclass)
-        stream << enumdeclaration << endl;
-    stream << "class TestClass" << endl;
-    stream << "{" << endl;
+        stream << enumdeclaration << Qt::endl;
+    stream << "class TestClass" << Qt::endl;
+    stream << "{" << Qt::endl;
     if (inclass)
-        stream << enumdeclaration << endl;
-    stream << "};" << endl;
+        stream << enumdeclaration << Qt::endl;
+    stream << "};" << Qt::endl;
     file.seek(0);
 
     RepParser parser(file);
@@ -399,10 +399,10 @@ void tst_Parser::testModels()
     QTemporaryFile file;
     file.open();
     QTextStream stream(&file);
-    stream << "class TestClass" << endl;
-    stream << "{" << endl;
-    stream << modelDeclaration << endl;
-    stream << "};" << endl;
+    stream << "class TestClass" << Qt::endl;
+    stream << "{" << Qt::endl;
+    stream << modelDeclaration << Qt::endl;
+    stream << "};" << Qt::endl;
     file.seek(0);
 
     RepParser parser(file);
@@ -439,14 +439,14 @@ void tst_Parser::testClasses()
     QTemporaryFile file;
     file.open();
     QTextStream stream(&file);
-    stream << "class subObject" << endl;
-    stream << "{" << endl;
-    stream << "    PROP(int value)" << endl;
-    stream << "};" << endl;
-    stream << "class parentObject" << endl;
-    stream << "{" << endl;
-    stream << classDeclaration << endl;
-    stream << "};" << endl;
+    stream << "class subObject" << Qt::endl;
+    stream << "{" << Qt::endl;
+    stream << "    PROP(int value)" << Qt::endl;
+    stream << "};" << Qt::endl;
+    stream << "class parentObject" << Qt::endl;
+    stream << "{" << Qt::endl;
+    stream << classDeclaration << Qt::endl;
+    stream << "};" << Qt::endl;
     file.seek(0);
 
     RepParser parser(file);
@@ -495,7 +495,7 @@ void tst_Parser::testInvalid()
     QTemporaryFile file;
     file.open();
     QTextStream stream(&file);
-    stream << content << endl;
+    stream << content << Qt::endl;
     file.seek(0);
 
     RepParser parser(file);
diff --git a/tools/repc/repcodegenerator.cpp b/tools/repc/repcodegenerator.cpp
index 001103c..0bce761 100644
--- a/tools/repc/repcodegenerator.cpp
+++ b/tools/repc/repcodegenerator.cpp
@@ -36,6 +36,8 @@
 #include <QCryptographicHash>
 #include <QRegExp>
 
+using namespace Qt;
+
 QT_BEGIN_NAMESPACE
 
 template <typename C>