fix build with SIP <4.19

jef-n · jef-n · commit 499459be4b64 · 2018-05-27T19:17:12.000+02:00
diff --git a/python/core/auto_generated/mesh/qgsmeshlayer.sip.in b/python/core/auto_generated/mesh/qgsmeshlayer.sip.in
@@ -79,7 +79,7 @@ is the MDAL connection string. QGIS must be built with MDAL support to allow thi
 
     struct LayerOptions
     {
-
+      int unused;  //! @todo remove me once there are actual members here (breaks SIP <4.19)
     };
 
     explicit QgsMeshLayer( const QString &path = QString(), const QString &baseName = QString(), const QString &providerLib = "mesh_memory",
diff --git a/python/core/auto_generated/qgsdataprovider.sip.in b/python/core/auto_generated/qgsdataprovider.sip.in
@@ -67,7 +67,7 @@ to generic QgsVectorDataProvider's) depends on it.
 
     struct ProviderOptions
     {
-
+      int unused; //! @todo remove me once there are actual members here (breaks SIP <4.19)
     };
 
     QgsDataProvider( const QString &uri = QString(), const QgsDataProvider::ProviderOptions &options = QgsDataProvider::ProviderOptions() );
diff --git a/src/core/mesh/qgsmeshlayer.h b/src/core/mesh/qgsmeshlayer.h
@@ -97,7 +97,7 @@ class CORE_EXPORT QgsMeshLayer : public QgsMapLayer
      */
     struct LayerOptions
     {
-
+      int unused;  //! @todo remove me once there are actual members here (breaks SIP <4.19)
     };
 
     /**
diff --git a/src/core/qgsdataprovider.h b/src/core/qgsdataprovider.h
@@ -103,7 +103,7 @@ class CORE_EXPORT QgsDataProvider : public QObject
      */
     struct ProviderOptions
     {
-
+      int unused; //! @todo remove me once there are actual members here (breaks SIP <4.19)
     };
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ is the MDAL connection string. QGIS must be built with MDAL support to allow thi`
`79`	`79`
`80`	`80`	`struct LayerOptions`
`81`	`81`	`{`
`82`		`-`
	`82`	`+ int unused; //! @todo remove me once there are actual members here (breaks SIP <4.19)`
`83`	`83`	`};`
`84`	`84`
`85`	`85`	`explicit QgsMeshLayer( const QString &path = QString(), const QString &baseName = QString(), const QString &providerLib = "mesh_memory",`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ to generic QgsVectorDataProvider's) depends on it.`
`67`	`67`
`68`	`68`	`struct ProviderOptions`
`69`	`69`	`{`
`70`		`-`
	`70`	`+ int unused; //! @todo remove me once there are actual members here (breaks SIP <4.19)`
`71`	`71`	`};`
`72`	`72`
`73`	`73`	`QgsDataProvider( const QString &uri = QString(), const QgsDataProvider::ProviderOptions &options = QgsDataProvider::ProviderOptions() );`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ class CORE_EXPORT QgsMeshLayer : public QgsMapLayer`
`97`	`97`	`*/`
`98`	`98`	`struct LayerOptions`
`99`	`99`	`{`
`100`		`-`
	`100`	`+ int unused; //! @todo remove me once there are actual members here (breaks SIP <4.19)`
`101`	`101`	`};`
`102`	`102`
`103`	`103`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ class CORE_EXPORT QgsDataProvider : public QObject`
`103`	`103`	`*/`
`104`	`104`	`struct ProviderOptions`
`105`	`105`	`{`
`106`		`-`
	`106`	`+ int unused; //! @todo remove me once there are actual members here (breaks SIP <4.19)`
`107`	`107`	`};`
`108`	`108`
`109`	`109`	`/**`