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

 Conflicts:
	.qmake.conf

Change-Id: I0398388adfa338cb5f3dda722f30da14b57dde00

5 files changed, 23 insertions, 22 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 96f7a81..a93cfcc 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
 CONFIG += warning_clean
 DEFINES += QT_NO_FOREACH
 
-MODULE_VERSION = 5.15.0
+MODULE_VERSION = 6.0.0
diff --git a/src/imports/xmllistmodel/plugin.cpp b/src/imports/xmllistmodel/plugin.cpp
index c5356b8..7cf9759 100644
--- a/src/imports/xmllistmodel/plugin.cpp
+++ b/src/imports/xmllistmodel/plugin.cpp
@@ -57,8 +57,9 @@ public:
         qmlRegisterType<QQuickXmlListModel>(uri,2,0,"XmlListModel");
         qmlRegisterType<QQuickXmlListModelRole>(uri,2,0,"XmlRole");
 
-        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward
-        qmlRegisterModule(uri, 2, 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, 2, 15);
     }
 };
 
diff --git a/tests/auto/qxmlquery/PushBaseliner.h b/tests/auto/qxmlquery/PushBaseliner.h
index 37d89ae..5553b8b 100644
--- a/tests/auto/qxmlquery/PushBaseliner.h
+++ b/tests/auto/qxmlquery/PushBaseliner.h
@@ -80,62 +80,62 @@ bool PushBaseliner::isValid() const
 
 void PushBaseliner::startElement(const QXmlName &name)
 {
-    m_out << "startElement(" << name.toClarkName(m_namePool) << ')'<< endl;
+    m_out << "startElement(" << name.toClarkName(m_namePool) << ')'<< Qt::endl;
 }
 
 void PushBaseliner::endElement()
 {
-    m_out << "endElement()" << endl;
+    m_out << "endElement()" << Qt::endl;
 }
 
 void PushBaseliner::attribute(const QXmlName &name, const QStringRef &value)
 {
-    m_out << "attribute(" << name.toClarkName(m_namePool) << ", " << value.toString() << ')'<< endl;
+    m_out << "attribute(" << name.toClarkName(m_namePool) << ", " << value.toString() << ')'<< Qt::endl;
 }
 
 void PushBaseliner::comment(const QString &value)
 {
-    m_out << "comment(" << value << ')' << endl;
+    m_out << "comment(" << value << ')' << Qt::endl;
 }
 
 void PushBaseliner::characters(const QStringRef &value)
 {
-    m_out << "characters(" << value.toString() << ')' << endl;
+    m_out << "characters(" << value.toString() << ')' << Qt::endl;
 }
 
 void PushBaseliner::startDocument()
 {
-    m_out << "startDocument()" << endl;
+    m_out << "startDocument()" << Qt::endl;
 }
 
 void PushBaseliner::endDocument()
 {
-    m_out << "endDocument()" << endl;
+    m_out << "endDocument()" << Qt::endl;
 }
 
 void PushBaseliner::processingInstruction(const QXmlName &name, const QString &data)
 {
-    m_out << "processingInstruction(" << name.toClarkName(m_namePool) << ", " << data << ')' << endl;
+    m_out << "processingInstruction(" << name.toClarkName(m_namePool) << ", " << data << ')' << Qt::endl;
 }
 
 void PushBaseliner::atomicValue(const QVariant &val)
 {
-    m_out << "atomicValue(" << val.toString() << ')' << endl;
+    m_out << "atomicValue(" << val.toString() << ')' << Qt::endl;
 }
 
 void PushBaseliner::namespaceBinding(const QXmlName &name)
 {
-    m_out << "namespaceBinding(" << name.toClarkName(m_namePool) << ')' << endl;
+    m_out << "namespaceBinding(" << name.toClarkName(m_namePool) << ')' << Qt::endl;
 }
 
 void PushBaseliner::startOfSequence()
 {
-    m_out << "startOfSequence()" << endl;
+    m_out << "startOfSequence()" << Qt::endl;
 }
 
 void PushBaseliner::endOfSequence()
 {
-    m_out << "endOfSequence()" << endl;
+    m_out << "endOfSequence()" << Qt::endl;
 }
 
 #endif
diff --git a/tests/auto/xmlpatternsview/view/MainWindow.cpp b/tests/auto/xmlpatternsview/view/MainWindow.cpp
index b0066ff..1c28d81 100644
--- a/tests/auto/xmlpatternsview/view/MainWindow.cpp
+++ b/tests/auto/xmlpatternsview/view/MainWindow.cpp
@@ -487,7 +487,7 @@ void MainWindow::on_actionRestart_triggered()
     else
     {
         QTextStream err(stderr);
-        err << "Failed to start " << qPrintable(QCoreApplication::applicationFilePath()) << endl;
+        err << "Failed to start " << qPrintable(QCoreApplication::applicationFilePath()) << Qt::endl;
     }
 }
 
diff --git a/tools/xmlpatterns/qapplicationargumentparser.cpp b/tools/xmlpatterns/qapplicationargumentparser.cpp
index 8aaae31..ce73485 100644
--- a/tools/xmlpatterns/qapplicationargumentparser.cpp
+++ b/tools/xmlpatterns/qapplicationargumentparser.cpp
@@ -245,7 +245,7 @@ bool QApplicationArgumentParserPrivate::error(const QString &message)
 bool QApplicationArgumentParserPrivate::errorMessage(const QString &message)
 {
     QTextStream out(stderr, QIODevice::WriteOnly);
-    out << message << endl;
+    out << message << Qt::endl;
     return false;
 }
 
@@ -290,7 +290,7 @@ void QApplicationArgumentParserPrivate::displayVersion() const
     QTextStream out(stderr);
 
     out << tr("%1 version %2 using Qt %3").arg(QCoreApplication::applicationName(), applicationVersion, QString::fromLatin1(qVersion()))
-        << endl;
+        << Qt::endl;
 }
 
 void QApplicationArgumentParserPrivate::displayHelp() const
@@ -356,16 +356,16 @@ void QApplicationArgumentParserPrivate::displayHelp() const
     }
 
     QTextStream out(stderr);
-    out << endl
+    out << Qt::endl
         << QString(IndentPadding, QLatin1Char(' '))
         << QCoreApplication::applicationName()
         << QLatin1String(" -- ")
         << applicationDescription
-        << endl;
+        << Qt::endl;
     // TODO synopsis
 
     /* One extra so we get some space between the overview and the options. */
-    out << endl;
+    out << Qt::endl;
 
     const int indentWidth = maxWidth + 3;
 
@@ -408,7 +408,7 @@ void QApplicationArgumentParserPrivate::displayHelp() const
 
         out << prolog
             << lineWrap(at.description(), indentWidth, LineWrapAt)
-            << endl;
+            << Qt::endl;
     }
 }