Ditching the subdirs template for all platforms.

src/QtLocationPlugin/QGCLocationPlugin.pro → src/QtLocationPlugin/QGCLocationPlugin.pri

 
-!ios {
-    include($$PWD/../../QGCCommon.pri)
-    TEMPLATE     = lib
-    TARGET       = QGeoServiceProviderFactoryQGC
-    CONFIG      += plugin static
-    PLUGIN_TYPE  = geoservices
-}
-
 QT  += location-private positioning-private network
 
 contains(QT_VERSION, 5.5.1) {

src/QtLocationPlugin/qgeoserviceproviderpluginqgc.cpp

@@ -51,7 +51,6 @@
 #include "qgeotiledmappingmanagerengineqgc.h"
 #include "qgeocodingmanagerengineqgc.h"
 
-#if defined (__ios__)
 Q_EXTERN_C Q_DECL_EXPORT const char *qt_plugin_query_metadata();
 Q_EXTERN_C Q_DECL_EXPORT QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance();
 const QT_PREPEND_NAMESPACE(QStaticPlugin) qt_static_plugin_QGeoServiceProviderFactoryQGC()
@@ -59,7 +58,6 @@ const QT_PREPEND_NAMESPACE(QStaticPlugin) qt_static_plugin_QGeoServiceProviderFa
     QT_PREPEND_NAMESPACE(QStaticPlugin) plugin = { qt_plugin_instance, qt_plugin_query_metadata};
     return plugin;
 }
-#endif
 
 QGeoCodingManagerEngine *QGeoServiceProviderFactoryQGC::createGeocodingManagerEngine(
     const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const