fix windows build

qgis · Oct 26, 2019 · 27b5646 · 27b5646
1 parent 58932e8
commit 27b5646
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
@@ -145,7 +145,7 @@ void QgsProviderRegistry::init()
     fileRegexp.setPattern( filePattern );
   }
 
-  typedef std::vector<QgsProviderMetadata *> multiple_factory_function();
+  typedef std::vector<QgsProviderMetadata *> *multiple_factory_function();
 
   const auto constEntryInfoList = mLibraryDirectory.entryInfoList();
   for ( const QFileInfo &fi : constEntryInfoList )
@@ -170,7 +170,8 @@ void QgsProviderRegistry::init()
     multiple_factory_function *multi_function = reinterpret_cast< multiple_factory_function * >( cast_to_fptr( multi_func ) );
     if ( multi_function )
     {
-      for ( const auto meta : multi_function() )
+      std::vector<QgsProviderMetadata *> *metadatas = multi_function();
+      for ( const auto meta : *metadatas )
       {
         if ( findMetadata_( mProviders, meta->key() ) )
         {
@@ -181,6 +182,7 @@ void QgsProviderRegistry::init()
         // add this provider to the provider map
         mProviders[meta->key()] = meta;
       }
+      delete metadatas;
     }
     else
     {

diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
@@ -1869,7 +1869,7 @@ QList<QgsDataItemProvider *> QgsWfsProviderMetadata::dataItemProviders() const
 QgsWfsProviderMetadata::QgsWfsProviderMetadata():
   QgsProviderMetadata( QgsWFSProvider::WFS_PROVIDER_KEY, QgsWFSProvider::WFS_PROVIDER_DESCRIPTION ) {}
 
-QGISEXTERN std::vector<QgsProviderMetadata *> multipleProviderMetadataFactory()
+QGISEXTERN void *multipleProviderMetadataFactory()
 {
-  return std::vector<QgsProviderMetadata *> { new QgsWfsProviderMetadata(), new QgsOapifProviderMetadata() };
+  return new std::vector<QgsProviderMetadata *> { new QgsWfsProviderMetadata(), new QgsOapifProviderMetadata() };
 }