diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-03-22 23:09:18 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-03-22 23:15:29 (GMT) |
| commit | 1fdd15b650f291ee63a8ebeb90e8965f95bdea90 (patch) | |
| tree | 28a664c751731a0e85e32e7afb28d45882e5ca8d | |
| parent | 7857d88a0163d12aca51c017d3fe1878fc3b89ae (diff) | |
| download | Qt-1fdd15b650f291ee63a8ebeb90e8965f95bdea90.zip Qt-1fdd15b650f291ee63a8ebeb90e8965f95bdea90.tar.gz Qt-1fdd15b650f291ee63a8ebeb90e8965f95bdea90.tar.bz2 | |
Revert "Avoid a data relocation by not trying to store a pointer in the .data section of plugins."
This commit is causing almost any autotest which loads a plugin to
crash, if Qt is configured with -qtnamespace and -qtlibinfix.
This reverts commit 69e873e2bfae3fc028c21d93112a75008c3bb58b.
| -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 7f541f1..b798437 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" \ |