From: Lars Knoll Date: Tue, 12 Jun 2012 09:43:45 +0000 (+0200) Subject: Make sure you can link against more than one static plugin X-Git-Tag: 071012110112~436 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f9c9d8aaa6684f596cf5675592782d5397e52093;p=profile%2Fivi%2Fqtbase.git Make sure you can link against more than one static plugin The old macro was leading to symbol clashes. Change-Id: I090c511d4090bc96fc6c88537fae7bbe7f143b6c Reviewed-by: Thiago Macieira Reviewed-by: Jason McDonald --- diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h index 61bd293..634663b 100644 --- a/src/corelib/plugin/qplugin.h +++ b/src/corelib/plugin/qplugin.h @@ -108,11 +108,11 @@ void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin staticPlugin); #if defined(QT_STATICPLUGIN) # define QT_MOC_EXPORT_PLUGIN(PLUGINCLASS) \ - static QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance() \ + static QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance_##PLUGINCLASS() \ Q_PLUGIN_INSTANCE(PLUGINCLASS) \ - static const char *qt_plugin_query_metadata() { return (const char *)qt_pluginMetaData; } \ + static const char *qt_plugin_query_metadata_##PLUGINCLASS() { return (const char *)qt_pluginMetaData; } \ const QT_PREPEND_NAMESPACE(QStaticPlugin) qt_static_plugin_##PLUGINCLASS() { \ - QT_PREPEND_NAMESPACE(QStaticPlugin) plugin = { qt_plugin_instance, qt_plugin_query_metadata }; \ + QT_PREPEND_NAMESPACE(QStaticPlugin) plugin = { qt_plugin_instance_##PLUGINCLASS, qt_plugin_query_metadata_##PLUGINCLASS}; \ return plugin; \ }