From: Kent Hansen <kent.hansen@nokia.com>
Date: Mon, 21 May 2012 11:15:28 +0000 (+0200)
Subject: Populate MetaData:Keys for compat plugins
X-Git-Tag: 071012110112~829
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=662c0a722a70cbd727e0b208777a787439705736;p=profile%2Fivi%2Fqtbase.git

Populate MetaData:Keys for compat plugins

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>
---

diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp
index 67b59f9..1e70e34 100644
--- a/src/corelib/plugin/qfactoryloader.cpp
+++ b/src/corelib/plugin/qfactoryloader.cpp
@@ -168,8 +168,12 @@ void QFactoryLoader::update()
                 if (instance && factory && instance->qt_metacast(d->iid))
                     keys = factory->keys();
 
-                if (!keys.isEmpty())
+                if (!keys.isEmpty()) {
                     metaDataOk = true;
+                    QJsonObject object = library->metaData.value(QLatin1String("MetaData")).toObject();
+                    object.insert(QLatin1String("Keys"), QJsonArray::fromStringList(keys));
+                    library->metaData[QLatin1String("MetaData")] = object;
+                }
 
             } else {
                 QString iid = library->metaData.value(QLatin1String("IID")).toString();