Merge pull request #36240 from troopa81/fix_snaptogridcanvasitem

Fix SIP QgsSnapToGridCanvasItem class declaration
qgis · May 7, 2020 · 10713dd · 10713dd
2 parents e441eaa + 985f86f
commit 10713dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/python/gui/auto_generated/qgssnaptogridcanvasitem.sip.in b/python/gui/auto_generated/qgssnaptogridcanvasitem.sip.in
@@ -14,7 +14,7 @@
 #include <qgssnaptogridcanvasitem.h>
 %End
 
-class QgsSnapToGridCanvasItem : QObject, QgsMapCanvasItem
+class QgsSnapToGridCanvasItem : QgsMapCanvasItem
 {
 %Docstring
 

diff --git a/src/gui/qgssnaptogridcanvasitem.h b/src/gui/qgssnaptogridcanvasitem.h
@@ -37,8 +37,14 @@
  *
  * \since QGIS 3.4
  */
+#ifndef SIP_RUN
 class GUI_EXPORT QgsSnapToGridCanvasItem : public QObject, public QgsMapCanvasItem
 {
+#else
+class GUI_EXPORT QgsSnapToGridCanvasItem : public QgsMapCanvasItem
+{
+#endif
+
     Q_OBJECT
 
 #ifdef SIP_RUN