diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-03-16 12:08:51 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-17 17:53:00 +0100 |
| commit | 7f67d0810e6899290b50120ee7a22d0a8a8300ec (patch) | |
| tree | b52ab40cbaf36471aa4ae9ff23b270416926650e | |
| parent | d823646db3e9f72569717dc656e5b2e4d3ce7709 (diff) | |
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 <lars.knoll@nokia.com>
| -rw-r--r-- | src/corelib/plugin/qfactoryloader.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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) { |