diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-06-02 05:42:13 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-06 02:02:49 +0200 |
| commit | 7443895857fdaee132c8efc643e471f02b3d0fa4 (patch) | |
| tree | 9a812815651552e361fd032946f2bfe1144ad9c5 /src/corelib/plugin/qelfparser_p.cpp | |
| parent | 9ca509676f3e7a4c19aded98c59990a779a4a052 (diff) | |
Remove support for Qt 4 style plugins
The new plugin format allows us to avoid loading the plugins in
all cases. Remove the old format, as we could get bad behavior
with the old format if Qt would try to dlopen a Qt 4.x plugin.
Change-Id: I2193e6874d6cca3c0b12298c2b9beb4105a42fd5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/plugin/qelfparser_p.cpp')
| -rw-r--r-- | src/corelib/plugin/qelfparser_p.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/plugin/qelfparser_p.cpp b/src/corelib/plugin/qelfparser_p.cpp index e4215dc39b..a108c053a6 100644 --- a/src/corelib/plugin/qelfparser_p.cpp +++ b/src/corelib/plugin/qelfparser_p.cpp @@ -203,7 +203,7 @@ int QElfParser::parse(const char *dataStart, ulong fdlen, const QString &library qDebug() << "++++" << i << shnam; #endif - if (qstrcmp(shnam, ".qtmetadata") == 0 || qstrcmp(shnam, ".qtplugin") == 0 || qstrcmp(shnam, ".rodata") == 0) { + if (qstrcmp(shnam, ".qtmetadata") == 0 || qstrcmp(shnam, ".rodata") == 0) { if (!(sh.type & 0x1)) { if (shnam[1] == 'r') { if (lib) @@ -227,7 +227,7 @@ int QElfParser::parse(const char *dataStart, ulong fdlen, const QString &library *pos = sh.offset; *sectionlen = sh.size - 1; if (shnam[1] == 'q') - return shnam[3] == 'm' ? QtMetaDataSection : QtPluginSection; + return QtMetaDataSection; } s += e_shentsize; } |