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

 Conflicts:
	.qmake.conf

Change-Id: I4860eb2ddcf1a7755ed62a4dd8d60936346125d5

4 files changed, 10 insertions, 7 deletions

diff --git a/.qmake.conf b/.qmake.conf
index b3c7403..85f18db 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
 
 DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
 
-MODULE_VERSION = 5.15.0
+MODULE_VERSION = 6.0.0
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);
 }