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

 Conflicts:
	.qmake.conf

Change-Id: I768ece1ea96b2d186484b72eafbc77c9ccfbb912

2 files changed, 6 insertions, 3 deletions

diff --git a/src/imports/audioengine/audioengine.cpp b/src/imports/audioengine/audioengine.cpp
index 537b09ab8..698f41bdc 100644
--- a/src/imports/audioengine/audioengine.cpp
+++ b/src/imports/audioengine/audioengine.cpp
@@ -80,7 +80,9 @@ public:
         qmlRegisterType<QDeclarativeAudioEngine, 1>(uri, 1, 1, "AudioEngine");
         qmlRegisterType<QDeclarativeSound, 1>(uri, 1, 1, "Sound");
 
-        qmlRegisterModule(uri, 1, 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, 1, 15);
     }
 };
 
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 8aed83d33..5e3071f2b 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -160,8 +160,9 @@ public:
         // 5.13 types
         qmlRegisterType<QDeclarativeVideoOutput, 13>(uri, 5, 13, "VideoOutput");
 
-        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward
-        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);
     }
 
     void initializeEngine(QQmlEngine *engine, const char *uri) override