From 7f67d0810e6899290b50120ee7a22d0a8a8300ec Mon Sep 17 00:00:00 2001 From: Lincoln Ramsay Date: Fri, 16 Mar 2012 12:08:51 +1000 Subject: Don't reject plugins that have empty meta-data 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 --- src/corelib/plugin/qfactoryloader.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp index cdc72cf35d..480bc0da74 100644 --- a/src/corelib/plugin/qfactoryloader.cpp +++ b/src/corelib/plugin/qfactoryloader.cpp @@ -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) { -- cgit v1.2.3