diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-01 20:55:42 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-04 20:48:28 (GMT) |
| commit | a4baffe212882c42d7674972a749b531289a7287 (patch) | |
| tree | af5b54ccb87e4812910d932e1c89293a7ca47d9e /src | |
| parent | f3132cba7af8a5325884c3c04eea7b2940863a78 (diff) | |
| download | Qt-a4baffe212882c42d7674972a749b531289a7287.zip Qt-a4baffe212882c42d7674972a749b531289a7287.tar.gz Qt-a4baffe212882c42d7674972a749b531289a7287.tar.bz2 | |
Reapply 69e873e2bfae3fc028c21d93112a75008c3bb58b now that QLibrary is fixed
It was:
"
Avoid a data relocation by not trying to store a pointer in the .data section of plugins.
Reviewed-By: Rohan McGovern
"
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/plugin/qplugin.h | 2 |
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" \ |