make cmake registration of qt plugins make use of PLUGIN_EXTENDS

instead of assigning plugins to the first module which claims the whole
type, try to assign it to a module which the plugin claims to extend.

as we are getting stricter in that go, somebody needs to claim the
'generic', 'platformthemes', and 'platforminputcontexts' plugin types.
the natural claimant is QtGui. however, as we don't want to auto-link
any of these plugins, make them all claim that they extend a
non-existing module.
QtGui also claims 'iconengines' plugins.
the 'printsupport' plugins are also claimed by the respective module.

Change-Id: I7af7c16089f137b8d4a4ed93d1577bd85815c87b
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

mkspecs/features/create_cmake.prf

@@ -111,15 +111,22 @@ if(build_all|CONFIG(debug, debug|release)): CMAKE_DEBUG_TYPE = debug
 if(build_all|CONFIG(release, debug|release)): CMAKE_RELEASE_TYPE = release
 
 contains(CONFIG, plugin) {
+    !isEmpty(PLUGIN_EXTENDS):!equals(PLUGIN_EXTENDS, -) {
+        count(PLUGIN_EXTENDS, 1, greaterThan): \
+            error("Plugin declares to extend multiple modules. We don't handle that ...")
+        PLUGIN_MODULE_NAME = $$PLUGIN_EXTENDS
+    } else {
         PLUGIN_MODULE_NAME =
         for (mod, QT_MODULES) {
-        types = $$replace(QT.$${mod}.plugin_types, /.*$, )
+            contains(QT.$${mod}.plugin_types, $$PLUGIN_TYPE) {
-        contains(types, $$PLUGIN_TYPE) {
+                !isEmpty(PLUGIN_MODULE_NAME): \
+                    error("Multiple modules claim plugin type '$$PLUGIN_TYPE' ($$mod, in addition to $$PLUGIN_MODULE_NAME)")
                 PLUGIN_MODULE_NAME = $$mod
                 break()
             }
         }
-    isEmpty(PLUGIN_MODULE_NAME): return()
+        isEmpty(PLUGIN_MODULE_NAME): error("No module claims plugin type '$$PLUGIN_TYPE'")
+    }
 
     CMAKE_MODULE_NAME = $$cmakeModuleName($$PLUGIN_MODULE_NAME)
 

src/gui/gui.pro

@@ -10,6 +10,10 @@ QMAKE_DOCS = $$PWD/doc/qtgui.qdocconf
 
 MODULE_PLUGIN_TYPES = \
     platforms \
+    platformthemes \
+    platforminputcontexts \
+    generic \
+    iconengines \
     imageformats
 
 # This is here only because the platform plugin is no module, obviously.

src/plugins/generic/evdevkeyboard/evdevkeyboard.pro

@@ -1,6 +1,7 @@
 TARGET = qevdevkeyboardplugin
 
 PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QEvdevKeyboardPlugin
 load(qt_plugin)
 

src/plugins/generic/evdevmouse/evdevmouse.pro

@@ -1,6 +1,7 @@
 TARGET = qevdevmouseplugin
 
 PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QEvdevMousePlugin
 load(qt_plugin)
 

src/plugins/generic/evdevtablet/evdevtablet.pro

@@ -1,6 +1,7 @@
 TARGET = qevdevtabletplugin
 
 PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QEvdevTabletPlugin
 load(qt_plugin)
 

src/plugins/generic/evdevtouch/evdevtouch.pro

@@ -1,6 +1,7 @@
 TARGET = qevdevtouchplugin
 
 PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QEvdevTouchScreenPlugin
 load(qt_plugin)
 

src/plugins/generic/meego/meego.pro

@@ -1,6 +1,7 @@
 TARGET = qmeegointegration
 
 PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QMeeGoIntegrationPlugin
 load(qt_plugin)
 

src/plugins/generic/tslib/tslib.pro

@@ -1,6 +1,7 @@
 TARGET = qtslibplugin
 
 PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QTsLibPlugin
 load(qt_plugin)
 

src/plugins/platforminputcontexts/compose/compose.pro

@@ -1,6 +1,7 @@
 TARGET = composeplatforminputcontextplugin
 
 PLUGIN_TYPE = platforminputcontexts
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QComposePlatformInputContextPlugin
 load(qt_plugin)
 

src/plugins/platforminputcontexts/ibus/ibus.pro

@@ -1,6 +1,7 @@
 TARGET = ibusplatforminputcontextplugin
 
 PLUGIN_TYPE = platforminputcontexts
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QIbusPlatformInputContextPlugin
 load(qt_plugin)
 

src/plugins/platformthemes/gtk2/gtk2.pro

@@ -1,6 +1,7 @@
 TARGET = qgtk2
 
 PLUGIN_TYPE = platformthemes
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QGtk2ThemePlugin
 load(qt_plugin)
 

src/printsupport/printsupport.pro

@@ -4,6 +4,9 @@ QT = core-private gui-private widgets-private
 MODULE_CONFIG = needs_printsupport_plugin
 DEFINES   += QT_NO_USING_NAMESPACE
 
+MODULE_PLUGIN_TYPES = \
+    printsupport
+
 QMAKE_DOCS = $$PWD/doc/qtprintsupport.qdocconf
 
 load(qt_module)