New plugin API changes, centralized geoservice feature detection

This change adapts geoservice plugins to use the new Qt5 plugin API,
performing boolean feature detection all through the JSON blobs
rather than methods on factories or managers.

As a result of this centralisation, it was also necessary to rework
the QML API for the Plugin element a little. Some additional changes
were made to the declarative places plugin to prevent it crashing
due to plugins becoming available later than they did previously.

Task-number: QTBUG-24331
Change-Id: I26149987344b67091480449103ab1712c869b2a5
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>

1 files changed, 16 insertions, 5 deletions

diff --git a/src/location/maps/qgeoserviceprovider_p.h b/src/location/maps/qgeoserviceprovider_p.h
index 812e7948..191f3517 100644
--- a/src/location/maps/qgeoserviceprovider_p.h
+++ b/src/location/maps/qgeoserviceprovider_p.h
@@ -56,6 +56,9 @@
 #include "qgeoserviceprovider.h"
 
 #include <QHash>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QLocale>
 
 QT_BEGIN_NAMESPACE
 
@@ -71,12 +74,16 @@ public:
     QGeoServiceProviderPrivate();
     ~QGeoServiceProviderPrivate();
 
-    void loadPlugin(const QString &providerName, const QMap<QString, QVariant> &parameters);
-
+    void loadMeta();
+    void loadPlugin(const QMap<QString, QVariant> &parameters);
+    void unload();
     QGeoServiceProviderFactory *factory;
+    QJsonObject metaData;
 
     QMap<QString, QVariant> parameterMap;
 
+    bool experimental;
+
     QGeocodingManager *geocodingManager;
     QGeoRoutingManager *routingManager;
     QGeoMappingManager *mappingManager;
@@ -95,9 +102,13 @@ public:
     QGeoServiceProvider::Error error;
     QString errorString;
 
-    static QHash<QString, QGeoServiceProviderFactory*> plugins(bool reload = false);
-    static void loadDynamicPlugins(QHash<QString, QGeoServiceProviderFactory*> *plugins);
-    static void loadStaticPlugins(QHash<QString, QGeoServiceProviderFactory*> *plugins);
+    QString providerName;
+
+    QLocale locale;
+    bool localeSet;
+
+    static QHash<QString, QJsonObject> plugins(bool reload = false);
+    static void loadPluginMetadata(QHash<QString, QJsonObject> &list);
 };
 
 QT_END_NAMESPACE