diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-02-17 16:31:06 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-17 08:46:06 +0100 |
| commit | 147a38faa6afbe616a9e6a123c8dbb5b00e458ef (patch) | |
| tree | 5a769499ce2450b3ceb185b43f491ae3728eb58c | |
| parent | d0759e348dd4d49b2e7e3907776406e93374ea40 (diff) | |
Static plugins don't break QFactoryLoader::keys()
The = means that a single, static, compat plugin replaces the list of
keys (eg. from previously checked static plugins or from dynamic plugins).
Using += prevents this undesirable behaviour.
Change-Id: I3a40752c08dddbfe81444ca9c782b633e9742ab9
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| -rw-r--r-- | src/corelib/plugin/qfactoryloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp index ce988fa2ff..2d31e1da7e 100644 --- a/src/corelib/plugin/qfactoryloader.cpp +++ b/src/corelib/plugin/qfactoryloader.cpp @@ -244,7 +244,7 @@ QStringList QFactoryLoader::keys() const QObject *instance = staticPlugins.at(i).instance(); QFactoryInterface *factory = qobject_cast<QFactoryInterface*>(instance); if (instance && factory && instance->qt_metacast(d->iid)) - keys = factory->keys(); + keys += factory->keys(); } } return keys; |