summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-03-20 22:15:23 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-20 23:32:21 (GMT)
commit69e873e2bfae3fc028c21d93112a75008c3bb58b (patch)
tree28659eddfef38b4dc5c15864ad2adc724d850d9e
parent29f94f0d25711bd30fd5ed7d6a6717ce4f2244d5 (diff)
downloadQt-69e873e2bfae3fc028c21d93112a75008c3bb58b.zip
Qt-69e873e2bfae3fc028c21d93112a75008c3bb58b.tar.gz
Qt-69e873e2bfae3fc028c21d93112a75008c3bb58b.tar.bz2
Avoid a data relocation by not trying to store a pointer in the .data section of plugins.
Reviewed-By: Rohan McGovern
-rw-r--r--src/corelib/plugin/qplugin.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h
index b798437..7f541f1 100644
--- a/src/corelib/plugin/qplugin.h
+++ b/src/corelib/plugin/qplugin.h
@@ -110,7 +110,7 @@ void Q_CORE_EXPORT qRegisterStaticPluginInstanceFunction(QtPluginInstanceFunctio
# define QPLUGIN_DEBUG_STR "true"
# endif
# define Q_PLUGIN_VERIFICATION_DATA \
- static const char *qt_plugin_verification_data = \
+ static const char qt_plugin_verification_data[] = \
"pattern=""QT_PLUGIN_VERIFICATION_DATA""\n" \
"version="QT_VERSION_STR"\n" \
"debug="QPLUGIN_DEBUG_STR"\n" \