summaryrefslogtreecommitdiffstats
path: root/src/corelib/plugin/qplugin.h
diff options
context:
space:
mode:
authorArvid Ephraim Picciani <arvid.picciani@nokia.com>2010-08-30 08:45:44 +0000
committerArvid Ephraim Picciani <arvid.picciani@nokia.com>2010-08-30 13:00:37 +0000
commite4f12672ab7a70dbaac2feb81499a9ee816f677f (patch)
tree27c08bbbfcb35bc4b9cd42fcf45d715bed639994 /src/corelib/plugin/qplugin.h
parent9678de93f4b3d0f59436d086de80d821b4694e98 (diff)
find .rodata in qt plugins to optimize loading of plugins with no qt section
Reviewed-by: janarve
Diffstat (limited to 'src/corelib/plugin/qplugin.h')
-rw-r--r--src/corelib/plugin/qplugin.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h
index 30c0c82718..bd49b15cf7 100644
--- a/src/corelib/plugin/qplugin.h
+++ b/src/corelib/plugin/qplugin.h
@@ -122,7 +122,7 @@ void Q_CORE_EXPORT qRegisterStaticPluginInstanceFunction(QtPluginInstanceFunctio
# if defined (Q_OF_ELF) && defined (Q_CC_GNU)
# define Q_PLUGIN_VERIFICATION_SECTION \
- __attribute__ ((section (".qplugin."QT_VERSION_STR QPLUGIN_SECTION_DEBUG_STR))) __attribute__((used)) static const char qt_plugin_build_key[] = QT_BUILD_KEY;
+ __attribute__ ((section (".qtplugin"))) __attribute__((used))
# else
# define Q_PLUGIN_VERIFICATION_SECTION
# endif
@@ -134,8 +134,7 @@ void Q_CORE_EXPORT qRegisterStaticPluginInstanceFunction(QtPluginInstanceFunctio
# endif
# define Q_EXPORT_PLUGIN2(PLUGIN, PLUGINCLASS) \
- Q_PLUGIN_VERIFICATION_SECTION \
- Q_PLUGIN_VERIFICATION_DATA \
+ Q_PLUGIN_VERIFICATION_SECTION Q_PLUGIN_VERIFICATION_DATA \
Q_EXTERN_C Q_DECL_EXPORT \
const char * Q_STANDARD_CALL qt_plugin_query_verification_data() \
{ return qt_plugin_verification_data; } \