Work around SIP bug

qgis · Jan 6, 2025 · 5c973b1 · 5c973b1
1 parent 4d86676
commit 5c973b1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/python/PyQt6/core/auto_generated/qgsoptional.sip.in b/python/PyQt6/core/auto_generated/qgsoptional.sip.in
@@ -72,6 +72,7 @@ Set the payload data
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/auto_generated/qgsoptional.sip.in b/python/core/auto_generated/qgsoptional.sip.in
@@ -72,6 +72,7 @@ Set the payload data
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/src/core/qgsoptional.h b/src/core/qgsoptional.h
@@ -129,4 +129,11 @@ class CORE_EXPORT QgsOptional
     T mData;
 };
 
+// These typedefs are in place to work around a SIP bug:
+// https://github.com/Python-SIP/sip/issues/66
+#ifndef SIP_RUN
+#include "qgsexpression.h"
+typedef QgsOptional<QgsExpression> QgsOptionalQgsExpressionBase;
+#endif
+
 #endif // QGSOPTIONAL_H
diff --git a/src/core/qgsrange.h b/src/core/qgsrange.h
@@ -219,6 +219,12 @@ class QgsRange
 
 };
 
+// These typedefs are in place to work around a SIP bug:
+// https://github.com/Python-SIP/sip/issues/66
+#ifndef SIP_RUN
+typedef QgsRange<double> QgsRangedoubleBase;
+typedef QgsRange<int> QgsRangeintBase;
+#endif
 
 /**
  * \brief QgsRange which stores a range of double values.
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,6 +72,7 @@ Set the payload data @@
     };
     /************************************************************************
      * This file has been generated automatically from                      *
      *                                                                      *
@@ Expand Down @@