12 files changed, 30 insertions, 7 deletions

diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 82e2812f3b..ac5fe22d75 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/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) {
-    PLUGIN_MODULE_NAME =
-    for (mod, QT_MODULES) {
-        types = $$replace(QT.$${mod}.plugin_types, /.*$, )
-        contains(types, $$PLUGIN_TYPE) {
-            PLUGIN_MODULE_NAME = $$mod
-            break()
+    !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) {
+            contains(QT.$${mod}.plugin_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): error("No module claims plugin type '$$PLUGIN_TYPE'")
     }
-    isEmpty(PLUGIN_MODULE_NAME): return()
 
     CMAKE_MODULE_NAME = $$cmakeModuleName($$PLUGIN_MODULE_NAME)
 
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index c5262501ac..6af692984a 100644
--- a/src/gui/gui.pro
+++ b/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.
diff --git a/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro b/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro
index 281515145f..101ea30bcc 100644
--- a/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro
+++ b/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro
@@ -1,6 +1,7 @@
 TARGET = qevdevkeyboardplugin
 
 PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QEvdevKeyboardPlugin
 load(qt_plugin)
 
diff --git a/src/plugins/generic/evdevmouse/evdevmouse.pro b/src/plugins/generic/evdevmouse/evdevmouse.pro
index 9a3cc839cc..57a67ead8d 100644
--- a/src/plugins/generic/evdevmouse/evdevmouse.pro
+++ b/src/plugins/generic/evdevmouse/evdevmouse.pro
@@ -1,6 +1,7 @@
 TARGET = qevdevmouseplugin
 
 PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QEvdevMousePlugin
 load(qt_plugin)
 
diff --git a/src/plugins/generic/evdevtablet/evdevtablet.pro b/src/plugins/generic/evdevtablet/evdevtablet.pro
index ee3fbb3ec1..8ffc0db84d 100644
--- a/src/plugins/generic/evdevtablet/evdevtablet.pro
+++ b/src/plugins/generic/evdevtablet/evdevtablet.pro
@@ -1,6 +1,7 @@
 TARGET = qevdevtabletplugin
 
 PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QEvdevTabletPlugin
 load(qt_plugin)
 
diff --git a/src/plugins/generic/evdevtouch/evdevtouch.pro b/src/plugins/generic/evdevtouch/evdevtouch.pro
index 3d1c481c36..1f4d1b7e93 100644
--- a/src/plugins/generic/evdevtouch/evdevtouch.pro
+++ b/src/plugins/generic/evdevtouch/evdevtouch.pro
@@ -1,6 +1,7 @@
 TARGET = qevdevtouchplugin
 
 PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QEvdevTouchScreenPlugin
 load(qt_plugin)
 
diff --git a/src/plugins/generic/meego/meego.pro b/src/plugins/generic/meego/meego.pro
index c428517cd5..4baaa43a4c 100644
--- a/src/plugins/generic/meego/meego.pro
+++ b/src/plugins/generic/meego/meego.pro
@@ -1,6 +1,7 @@
 TARGET = qmeegointegration
 
 PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QMeeGoIntegrationPlugin
 load(qt_plugin)
 
diff --git a/src/plugins/generic/tslib/tslib.pro b/src/plugins/generic/tslib/tslib.pro
index 035857bb73..bc05efcc32 100644
--- a/src/plugins/generic/tslib/tslib.pro
+++ b/src/plugins/generic/tslib/tslib.pro
@@ -1,6 +1,7 @@
 TARGET = qtslibplugin
 
 PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QTsLibPlugin
 load(qt_plugin)
 
diff --git a/src/plugins/platforminputcontexts/compose/compose.pro b/src/plugins/platforminputcontexts/compose/compose.pro
index 7182c458fc..10e50a7a7e 100644
--- a/src/plugins/platforminputcontexts/compose/compose.pro
+++ b/src/plugins/platforminputcontexts/compose/compose.pro
@@ -1,6 +1,7 @@
 TARGET = composeplatforminputcontextplugin
 
 PLUGIN_TYPE = platforminputcontexts
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QComposePlatformInputContextPlugin
 load(qt_plugin)
 
diff --git a/src/plugins/platforminputcontexts/ibus/ibus.pro b/src/plugins/platforminputcontexts/ibus/ibus.pro
index 75a5b5838f..401be6d42f 100644
--- a/src/plugins/platforminputcontexts/ibus/ibus.pro
+++ b/src/plugins/platforminputcontexts/ibus/ibus.pro
@@ -1,6 +1,7 @@
 TARGET = ibusplatforminputcontextplugin
 
 PLUGIN_TYPE = platforminputcontexts
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QIbusPlatformInputContextPlugin
 load(qt_plugin)
 
diff --git a/src/plugins/platformthemes/gtk2/gtk2.pro b/src/plugins/platformthemes/gtk2/gtk2.pro
index bb02192f91..73c156f82b 100644
--- a/src/plugins/platformthemes/gtk2/gtk2.pro
+++ b/src/plugins/platformthemes/gtk2/gtk2.pro
@@ -1,6 +1,7 @@
 TARGET = qgtk2
 
 PLUGIN_TYPE = platformthemes
+PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QGtk2ThemePlugin
 load(qt_plugin)
 
diff --git a/src/printsupport/printsupport.pro b/src/printsupport/printsupport.pro
index a92d36f7bc..b32ba91c07 100644
--- a/src/printsupport/printsupport.pro
+++ b/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)