diff options
| author | Lukas Geyer <lgeyer@gmx.at> | 2012-08-25 01:06:39 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-29 07:56:40 +0200 |
| commit | f61d02deeae522c410433a3aa9929e246f413cda (patch) | |
| tree | 0164052877cf21e6d94d21377e556c3e0d6c0148 /src/corelib/plugin/qpluginloader.cpp | |
| parent | 32efe589a39989d81e303219074958181ef44ff4 (diff) | |
Plugin metadata is now updated in setFileName(), not load().
Plugin metadata has been updated in load(), with the
side-effect of metadata not beeing available until
plugin has been loaded - and which the new metadata
system tries to prevent in the first place. The
metadata is now updated (and avaiable) as soon as
a valid filename is set.
Change-Id: Ia5aedc67d8115e71c2ecbcbcadf786ba1c2893d8
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/plugin/qpluginloader.cpp')
| -rw-r--r-- | src/corelib/plugin/qpluginloader.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp index 4ef36afcea..2216c1b908 100644 --- a/src/corelib/plugin/qpluginloader.cpp +++ b/src/corelib/plugin/qpluginloader.cpp @@ -283,6 +283,9 @@ void QPluginLoader::setFileName(const QString &fileName) d->loadHints = lh; if (fn.isEmpty()) d->errorString = QLibrary::tr("The shared library was not found."); + else + d->updatePluginState(); + #else if (qt_debug_component()) { qWarning("Cannot load %s into a statically linked Qt library.", |