CMake: Use modified target name as base name for internal qml plugins

Using only the last dot component of the URI as the plugin base name
causes issues when an app that uses QtQuickControls2 is
macdeployqt'ed.

The qqc2 impl plugins all have "impl" as the last URI component and
thus they all use "impl" as the base name.
macdeployqt tries to copy all of the plugins into a flattened
PlugIns/quick folder, which ends up copying only one of the files.

User qml plugins use the plugin target name as the plugin base name
and plugin file name on-disk.

There shouldn't be a reason for internal qml plugins to deviate too
much from that.

Adjust the internal qml plugin name to use the plugin target name with
"plugin" suffixed at the end, but make sure to remove any existing
"plugin" from the target name if it already exists, so we don't end up
with double "plugin" in the base name.

Amends a25f650c317e4886007a8beb0e9f2f7e973e6e7c

Task-number: QTBUG-95140
Task-number: QTBUG-96261
Change-Id: If6096e88bf2da3de081d68fad2e70cef5a0b18af
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 658a911f9c8789418710bcbd9513774de89cb082)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

16 files changed, 28 insertions, 28 deletions

diff --git a/tests/auto/qml/qmlimportscanner/data/CompositeSingleton.json b/tests/auto/qml/qmlimportscanner/data/CompositeSingleton.json
index 4978bb1d77..51b1033a9c 100644
--- a/tests/auto/qml/qmlimportscanner/data/CompositeSingleton.json
+++ b/tests/auto/qml/qmlimportscanner/data/CompositeSingleton.json
@@ -8,7 +8,7 @@
         "classname": "QtQuick2Plugin",
         "linkTarget": "Qt6::qtquick2plugin",
         "name": "QtQuick",
-        "plugin": "qtquickplugin",
+        "plugin": "qtquick2plugin",
         "pluginIsOptional": true,
         "relativePath": "QtQuick",
         "type": "module"
@@ -17,7 +17,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"
diff --git a/tests/auto/qml/qmlimportscanner/data/CompositeWithEnum.json b/tests/auto/qml/qmlimportscanner/data/CompositeWithEnum.json
index 9afc620f17..e0c37d24c4 100644
--- a/tests/auto/qml/qmlimportscanner/data/CompositeWithEnum.json
+++ b/tests/auto/qml/qmlimportscanner/data/CompositeWithEnum.json
@@ -8,7 +8,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"
diff --git a/tests/auto/qml/qmlimportscanner/data/CompositeWithinSingleton.json b/tests/auto/qml/qmlimportscanner/data/CompositeWithinSingleton.json
index 274ee20a97..e4135c559c 100644
--- a/tests/auto/qml/qmlimportscanner/data/CompositeWithinSingleton.json
+++ b/tests/auto/qml/qmlimportscanner/data/CompositeWithinSingleton.json
@@ -8,7 +8,7 @@
         "classname": "QtQuick2Plugin",
         "linkTarget": "Qt6::qtquick2plugin",
         "name": "QtQuick",
-        "plugin": "qtquickplugin",
+        "plugin": "qtquick2plugin",
         "pluginIsOptional": true,
         "relativePath": "QtQuick",
         "type": "module"
@@ -17,7 +17,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"
diff --git a/tests/auto/qml/qmlimportscanner/data/Drawer.qml.json b/tests/auto/qml/qmlimportscanner/data/Drawer.qml.json
index efc104cb69..424c6ca8ee 100644
--- a/tests/auto/qml/qmlimportscanner/data/Drawer.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/Drawer.qml.json
@@ -3,7 +3,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"
diff --git a/tests/auto/qml/qmlimportscanner/data/Imports.json b/tests/auto/qml/qmlimportscanner/data/Imports.json
index d1410cb626..16b7376713 100644
--- a/tests/auto/qml/qmlimportscanner/data/Imports.json
+++ b/tests/auto/qml/qmlimportscanner/data/Imports.json
@@ -8,7 +8,7 @@
         "classname": "QtQuick2Plugin",
         "linkTarget": "Qt6::qtquick2plugin",
         "name": "QtQuick",
-        "plugin": "qtquickplugin",
+        "plugin": "qtquick2plugin",
         "pluginIsOptional": true,
         "relativePath": "QtQuick",
         "type": "module"
@@ -17,7 +17,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"
diff --git a/tests/auto/qml/qmlimportscanner/data/ListProperty.qml.json b/tests/auto/qml/qmlimportscanner/data/ListProperty.qml.json
index c49f02e710..bd9faec18c 100644
--- a/tests/auto/qml/qmlimportscanner/data/ListProperty.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/ListProperty.qml.json
@@ -3,7 +3,7 @@
         "classname": "QtQuick2Plugin",
         "name": "QtQuick",
         "linkTarget": "Qt6::qtquick2plugin",
-        "plugin": "qtquickplugin",
+        "plugin": "qtquick2plugin",
         "pluginIsOptional": true,
         "relativePath": "QtQuick",
         "type": "module"
@@ -18,7 +18,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"
diff --git a/tests/auto/qml/qmlimportscanner/data/QTBUG-45916.js.json b/tests/auto/qml/qmlimportscanner/data/QTBUG-45916.js.json
index 948a629903..d132b676ec 100644
--- a/tests/auto/qml/qmlimportscanner/data/QTBUG-45916.js.json
+++ b/tests/auto/qml/qmlimportscanner/data/QTBUG-45916.js.json
@@ -3,7 +3,7 @@
         "classname": "QtQuick2Plugin",
         "linkTarget": "Qt6::qtquick2plugin",
         "name": "QtQuick",
-        "plugin": "qtquickplugin",
+        "plugin": "qtquick2plugin",
         "pluginIsOptional": true,
         "relativePath": "QtQuick",
         "type": "module"
@@ -12,7 +12,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"
diff --git a/tests/auto/qml/qmlimportscanner/data/Simple.qml.json b/tests/auto/qml/qmlimportscanner/data/Simple.qml.json
index 948a629903..d132b676ec 100644
--- a/tests/auto/qml/qmlimportscanner/data/Simple.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/Simple.qml.json
@@ -3,7 +3,7 @@
         "classname": "QtQuick2Plugin",
         "linkTarget": "Qt6::qtquick2plugin",
         "name": "QtQuick",
-        "plugin": "qtquickplugin",
+        "plugin": "qtquick2plugin",
         "pluginIsOptional": true,
         "relativePath": "QtQuick",
         "type": "module"
@@ -12,7 +12,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"
diff --git a/tests/auto/qml/qmlimportscanner/data/Singleton.json b/tests/auto/qml/qmlimportscanner/data/Singleton.json
index ad8e6dc0ec..5600cfc6a2 100644
--- a/tests/auto/qml/qmlimportscanner/data/Singleton.json
+++ b/tests/auto/qml/qmlimportscanner/data/Singleton.json
@@ -8,7 +8,7 @@
         "classname": "QtQuick2Plugin",
         "linkTarget": "Qt6::qtquick2plugin",
         "name": "QtQuick",
-        "plugin": "qtquickplugin",
+        "plugin": "qtquick2plugin",
         "pluginIsOptional": true,
         "relativePath": "QtQuick",
         "type": "module"
@@ -17,7 +17,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"
diff --git a/tests/auto/qml/qmlimportscanner/data/Things.json b/tests/auto/qml/qmlimportscanner/data/Things.json
index 27814e1246..1245539b57 100644
--- a/tests/auto/qml/qmlimportscanner/data/Things.json
+++ b/tests/auto/qml/qmlimportscanner/data/Things.json
@@ -9,7 +9,7 @@
         "classname": "QtQuick2Plugin",
         "linkTarget": "Qt6::qtquick2plugin",
         "name": "QtQuick",
-        "plugin": "qtquickplugin",
+        "plugin": "qtquick2plugin",
         "pluginIsOptional": true,
         "relativePath": "QtQuick",
         "type": "module"
@@ -18,7 +18,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"
diff --git a/tests/auto/qml/qmlimportscanner/data/javascriptMethods.qml.json b/tests/auto/qml/qmlimportscanner/data/javascriptMethods.qml.json
index 5cd9f6dea0..737b90fcc6 100644
--- a/tests/auto/qml/qmlimportscanner/data/javascriptMethods.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/javascriptMethods.qml.json
@@ -3,7 +3,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"
diff --git a/tests/auto/qml/qmlimportscanner/data/localImport.qml.json b/tests/auto/qml/qmlimportscanner/data/localImport.qml.json
index 27814e1246..1245539b57 100644
--- a/tests/auto/qml/qmlimportscanner/data/localImport.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/localImport.qml.json
@@ -9,7 +9,7 @@
         "classname": "QtQuick2Plugin",
         "linkTarget": "Qt6::qtquick2plugin",
         "name": "QtQuick",
-        "plugin": "qtquickplugin",
+        "plugin": "qtquick2plugin",
         "pluginIsOptional": true,
         "relativePath": "QtQuick",
         "type": "module"
@@ -18,7 +18,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"
diff --git a/tests/auto/qml/qmlimportscanner/data/parentEnum.qml.json b/tests/auto/qml/qmlimportscanner/data/parentEnum.qml.json
index 948a629903..d132b676ec 100644
--- a/tests/auto/qml/qmlimportscanner/data/parentEnum.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/parentEnum.qml.json
@@ -3,7 +3,7 @@
         "classname": "QtQuick2Plugin",
         "linkTarget": "Qt6::qtquick2plugin",
         "name": "QtQuick",
-        "plugin": "qtquickplugin",
+        "plugin": "qtquick2plugin",
         "pluginIsOptional": true,
         "relativePath": "QtQuick",
         "type": "module"
@@ -12,7 +12,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"
diff --git a/tests/auto/qml/qmlimportscanner/data/qmldirImportAndDepend.qml.json b/tests/auto/qml/qmlimportscanner/data/qmldirImportAndDepend.qml.json
index 27814e1246..1245539b57 100644
--- a/tests/auto/qml/qmlimportscanner/data/qmldirImportAndDepend.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/qmldirImportAndDepend.qml.json
@@ -9,7 +9,7 @@
         "classname": "QtQuick2Plugin",
         "linkTarget": "Qt6::qtquick2plugin",
         "name": "QtQuick",
-        "plugin": "qtquickplugin",
+        "plugin": "qtquick2plugin",
         "pluginIsOptional": true,
         "relativePath": "QtQuick",
         "type": "module"
@@ -18,7 +18,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"
diff --git a/tests/auto/qml/qmlimportscanner/data/qtQmlOnly.qml.json b/tests/auto/qml/qmlimportscanner/data/qtQmlOnly.qml.json
index efc104cb69..424c6ca8ee 100644
--- a/tests/auto/qml/qmlimportscanner/data/qtQmlOnly.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/qtQmlOnly.qml.json
@@ -3,7 +3,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"
diff --git a/tests/auto/qml/qmlimportscanner/data/rootPath.json b/tests/auto/qml/qmlimportscanner/data/rootPath.json
index 7abce5675b..12850aa8bb 100644
--- a/tests/auto/qml/qmlimportscanner/data/rootPath.json
+++ b/tests/auto/qml/qmlimportscanner/data/rootPath.json
@@ -3,7 +3,7 @@
         "classname": "QtQuick2Plugin",
         "linkTarget": "Qt6::qtquick2plugin",
         "name": "QtQuick",
-        "plugin": "qtquickplugin",
+        "plugin": "qtquick2plugin",
         "pluginIsOptional": true,
         "relativePath": "QtQuick",
         "type": "module"
@@ -12,7 +12,7 @@
         "classname": "QtQmlPlugin",
         "linkTarget": "Qt6::qmlplugin",
         "name": "QtQml",
-        "plugin": "qtqmlplugin",
+        "plugin": "qmlplugin",
         "pluginIsOptional": true,
         "relativePath": "QtQml",
         "type": "module"