Fix sip

qgis · Jun 3, 2021 · cebb1f8 · cebb1f8
1 parent ca00377
commit cebb1f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/python/core/auto_generated/vector/qgsvectorlayerfeatureiterator.sip.in b/python/core/auto_generated/vector/qgsvectorlayerfeatureiterator.sip.in
@@ -111,7 +111,7 @@ end of iterating: free the resources / lock
       QgsAttributeList attributes;      //!< Attributes to fetch
       int indexOffset;                  //!< At what position the joined fields start
 
- QgsVectorLayer *joinLayer /Deprecated/;
+      QgsVectorLayer *joinLayer /Deprecated/;
 
 
       QgsFields joinLayerFields;

diff --git a/src/core/vector/qgsvectorlayerfeatureiterator.h b/src/core/vector/qgsvectorlayerfeatureiterator.h
@@ -157,7 +157,11 @@ class CORE_EXPORT QgsVectorLayerFeatureIterator : public QgsAbstractFeatureItera
        * Resolved pointer to the joined layer
        * \deprecated Do NOT use. This is not thread safe, and should never be accessed from a background thread.
        */
-      Q_DECL_DEPRECATED QgsVectorLayer *joinLayer SIP_DEPRECATED = nullptr;
+#ifndef SIP_RUN
+      Q_DECL_DEPRECATED QgsVectorLayer *joinLayer = nullptr;
+#else
+      QgsVectorLayer *joinLayer SIP_DEPRECATED;
+#endif
 
       /**
        * Feature source for join