Don't reject plugins that have empty meta-data
authorLincoln Ramsay <lincoln.ramsay@nokia.com>
Fri, 16 Mar 2012 02:08:51 +0000 (12:08 +1000)
committerQt by Nokia <qt-info@nokia.com>
Sat, 17 Mar 2012 16:53:00 +0000 (17:53 +0100)
Having an empty Json object ({}) should be valid meta-data but this
check means that there needs to be at least one key-value pair or
the plugin will be rejected.

Change-Id: I578ccc35016af16fd30b3807e796fa63c0282f30
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
src/corelib/plugin/qfactoryloader.cpp

index cdc72cf..480bc0d 100644 (file)
@@ -175,8 +175,7 @@ void QFactoryLoader::update()
                 QString iid = library->metaData.value(QLatin1String("IID")).toString();
                 if (iid == QLatin1String(d->iid.constData(), d->iid.size())) {
                     QJsonObject object = library->metaData.value(QLatin1String("MetaData")).toObject();
-                    if (!object.isEmpty())
-                        metaDataOk = true;
+                    metaDataOk = true;
 
                     QJsonArray k = object.value(QLatin1String("Keys")).toArray();
                     for (int i = 0; i < k.size(); ++i) {