Fix Qt6 build

Modify all the qmlRegisterModule calls to use minor version 15
because minor version zero from 6.0.0 would make tests fail.

This is similar to what was done in qtdeclarative in
c147b20a2c1299b2d659fe7c9472ae3866b6a425.

Change-Id: I13b4f6c647dc808f91cc9e38ec22af7860b93022
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

3 files changed, 9 insertions, 6 deletions

diff --git a/src/effects/plugin.cpp b/src/effects/plugin.cpp
index cdd3a80..4a047ba 100644
--- a/src/effects/plugin.cpp
+++ b/src/effects/plugin.cpp
@@ -56,8 +56,9 @@ public:
 
         qmlRegisterModule(uri, 1, 0);
 
-        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.12 onward
-        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/effects/private/plugin.cpp b/src/effects/private/plugin.cpp
index 5537ba8..ebb1dc7 100644
--- a/src/effects/private/plugin.cpp
+++ b/src/effects/private/plugin.cpp
@@ -64,8 +64,9 @@ public:
         qmlRegisterType<QGfxSourceProxy>(uri, 1, 0, "SourceProxy");
         qmlRegisterSingletonType<QGfxShaderBuilder>(uri, 1, 0, "ShaderBuilder", qgfxshaderbuilder_provider);
 
-        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.12 onward
-        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/tools/pngdumper/pngdumper_plugin.cpp b/tools/pngdumper/pngdumper_plugin.cpp
index caf6565..f6974b7 100644
--- a/tools/pngdumper/pngdumper_plugin.cpp
+++ b/tools/pngdumper/pngdumper_plugin.cpp
@@ -35,7 +35,8 @@ void ItemcapturerPlugin::registerTypes(const char *uri)
 {
     qmlRegisterType<ItemCapturer>(uri, 1, 0, "ItemCapturer");
 
-    // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.12 onward
-    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);
 }