From 08672adb97c0707c513850a27aaec59327874260 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 2 Apr 2014 22:19:01 +0200 Subject: make cmake registration of qt plugins make use of PLUGIN_EXTENDS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Joerg Bornemann Reviewed-by: Oswald Buddenhagen --- src/plugins/generic/evdevkeyboard/evdevkeyboard.pro | 1 + src/plugins/generic/evdevmouse/evdevmouse.pro | 1 + src/plugins/generic/evdevtablet/evdevtablet.pro | 1 + src/plugins/generic/evdevtouch/evdevtouch.pro | 1 + src/plugins/generic/meego/meego.pro | 1 + src/plugins/generic/tslib/tslib.pro | 1 + src/plugins/platforminputcontexts/compose/compose.pro | 1 + src/plugins/platforminputcontexts/ibus/ibus.pro | 1 + src/plugins/platformthemes/gtk2/gtk2.pro | 1 + 9 files changed, 9 insertions(+) (limited to 'src/plugins') 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) -- cgit v1.2.3