From 1fdd15b650f291ee63a8ebeb90e8965f95bdea90 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 23 Mar 2010 09:09:18 +1000 Subject: 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. --- src/corelib/plugin/qplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" \ -- cgit v0.12