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

6 files changed, 16 insertions, 14 deletions

diff --git a/.qmake.conf b/.qmake.conf
index ad4261de..fd350632 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,7 +3,7 @@ CONFIG += warning_clean
 
 DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
 
-MODULE_VERSION = 5.15.0
+MODULE_VERSION = 6.0.0
 
 # Adds a way to debug location. The define is needed for multiple subprojects as they
 # include the essential headers.
diff --git a/examples/location/mapviewer/main.cpp b/examples/location/mapviewer/main.cpp
index b332de8c..ec54b5a2 100644
--- a/examples/location/mapviewer/main.cpp
+++ b/examples/location/mapviewer/main.cpp
@@ -66,8 +66,8 @@ static bool parseArgs(QStringList& args, QVariantMap& parameters)
 
         if (param.startsWith("--help")) {
             QTextStream out(stdout);
-            out << "Usage: " << endl;
-            out << "--plugin.<parameter_name> <parameter_value>    -  Sets parameter = value for plugin" << endl;
+            out << "Usage: " << Qt::endl;
+            out << "--plugin.<parameter_name> <parameter_value>    -  Sets parameter = value for plugin" << Qt::endl;
             out.flush();
             return true;
         }
diff --git a/examples/location/places/main.cpp b/examples/location/places/main.cpp
index c677e429..69d31ae8 100644
--- a/examples/location/places/main.cpp
+++ b/examples/location/places/main.cpp
@@ -63,8 +63,8 @@ static bool parseArgs(QStringList& args, QVariantMap& parameters)
 
         if (param.startsWith("--help")) {
             QTextStream out(stdout);
-            out << "Usage: " << endl;
-            out << "--plugin.<parameter_name> <parameter_value>    -  Sets parameter = value for plugin" << endl;
+            out << "Usage: " << Qt::endl;
+            out << "--plugin.<parameter_name> <parameter_value>    -  Sets parameter = value for plugin" << Qt::endl;
             out.flush();
             return true;
         }
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 40dffd5d..00f6454b 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -206,8 +206,9 @@ public:
             qmlRegisterUncreatableType<QDeclarativeGeoMapItemBase, 14>(uri, major, minor, "GeoMapItemBase",
                                         QStringLiteral("GeoMapItemBase is not intended instantiable by developer."));
 
-            // Register the latest Qt version as QML type version
-            qmlRegisterModule(uri, QT_VERSION_MAJOR, 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);
 
             //registrations below are version independent
             qRegisterMetaType<QPlaceCategory>();
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 38b9378a..27098a85 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -619,8 +619,9 @@ public:
             minor = 14;
             qmlRegisterType<QDeclarativePluginParameter >(uri, major, minor, "PluginParameter");
 
-            // Register the latest Qt version as QML type version
-            qmlRegisterModule(uri, QT_VERSION_MAJOR, 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);
         } else {
             qDebug() << "Unsupported URI given to load positioning QML plugin: " << QLatin1String(uri);
         }
diff --git a/src/positioning/qdoublematrix4x4.cpp b/src/positioning/qdoublematrix4x4.cpp
index 32cc7f1f..0bc56460 100644
--- a/src/positioning/qdoublematrix4x4.cpp
+++ b/src/positioning/qdoublematrix4x4.cpp
@@ -1072,12 +1072,12 @@ QDebug operator<<(QDebug dbg, const QDoubleMatrix4x4 &m)
     }
 
     // Output in row-major order because it is more human-readable.
-    dbg.nospace() << "QDoubleMatrix4x4(type:" << bits.constData() << endl
+    dbg.nospace() << "QDoubleMatrix4x4(type:" << bits.constData() << Qt::endl
         << qSetFieldWidth(10)
-        << m(0, 0) << m(0, 1) << m(0, 2) << m(0, 3) << endl
-        << m(1, 0) << m(1, 1) << m(1, 2) << m(1, 3) << endl
-        << m(2, 0) << m(2, 1) << m(2, 2) << m(2, 3) << endl
-        << m(3, 0) << m(3, 1) << m(3, 2) << m(3, 3) << endl
+        << m(0, 0) << m(0, 1) << m(0, 2) << m(0, 3) << Qt::endl
+        << m(1, 0) << m(1, 1) << m(1, 2) << m(1, 3) << Qt::endl
+        << m(2, 0) << m(2, 1) << m(2, 2) << m(2, 3) << Qt::endl
+        << m(3, 0) << m(3, 1) << m(3, 2) << m(3, 3) << Qt::endl
         << qSetFieldWidth(0) << ')';
     return dbg;
 }