AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Populate MetaData:Keys for compat plugins

Browse Source 
QFactoryLoader::indexOf() expects the meta-data to contain a Keys
entry, if there were any keys. For compat plugins, the result of
the plugin's keys() function should be stored here.

Change-Id: Ifd04f90cbfce2598d71548c469baa55ca6b0b338
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Kent Hansen 2012-05-21 13:15:28 +02:00 committed by Qt by Nokia
parent 36f469bdb1
commit 662c0a722a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/plugin/qfactoryloader.cpp
View File

@ -168,8 +168,12 @@ void QFactoryLoader::update()
if (instance && factory && instance->qt_metacast(d->iid)) if (instance && factory && instance->qt_metacast(d->iid))
keys = factory->keys(); keys = factory->keys();
if (!keys.isEmpty()) if (!keys.isEmpty()) {
metaDataOk = true; metaDataOk = true;
QJsonObject object = library->metaData.value(QLatin1String("MetaData")).toObject();
object.insert(QLatin1String("Keys"), QJsonArray::fromStringList(keys));
library->metaData[QLatin1String("MetaData")] = object;
}
} else { } else {
QString iid = library->metaData.value(QLatin1String("IID")).toString(); QString iid = library->metaData.value(QLatin1String("IID")).toString();