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

 Conflicts:
	.qmake.conf

Change-Id: I6cf814d560665490574bd35d5ebfce911a46270f

1 files changed, 3 insertions, 2 deletions

diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
index ce80a45c..de872c48 100644
--- a/src/imports/sensors/sensors.cpp
+++ b/src/imports/sensors/sensors.cpp
@@ -234,8 +234,9 @@ public:
         qmlRegisterType           <QmlHumiditySensor           >(package, major, minor, "HumiditySensor");
         qmlRegisterUncreatableType<QmlHumidityReading          >(package, major, minor, "HumidityReading",     QLatin1String("Cannot create HumidityReading"));
 
-        // Register the latest Qt version as QML type version
-        qmlRegisterModule(package, 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(package, 5, 15);
     }
 };