build(QSci): fix build when python QSci is missing

qgis · Dec 17, 2024 · 209043e · 209043e
1 parent 0fdb350
commit 209043e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/python/PyQt6/gui/auto_generated/editorwidgets/qgsjsoneditwidget.sip.in b/python/PyQt6/gui/auto_generated/editorwidgets/qgsjsoneditwidget.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsJsonEditWidget : QWidget
 {
 %Docstring(signature="appended")

diff --git a/python/PyQt6/gui/gui.sip.in b/python/PyQt6/gui/gui.sip.in
@@ -12,6 +12,9 @@ ${DEFAULTDOCSTRINGSIGNATURE}
 %Import QtGui/QtGuimod.sip
 %Import QtXml/QtXmlmod.sip
 %Import QtMultimedia/QtMultimediamod.sip
-%Import ${QSCI_SIP_MOD_NAME}
+
+%If (HAVE_QSCI_SIP)
+    %Import ${QSCI_SIP_MOD_NAME}
+%End
 
 %Include gui_auto.sip
diff --git a/python/PyQt6/gui/gui_auto.sip b/python/PyQt6/gui/gui_auto.sip
@@ -323,7 +323,9 @@
 %Include auto_generated/editorwidgets/qgsdefaultsearchwidgetwrapper.sip
 %Include auto_generated/editorwidgets/qgsdoublespinbox.sip
 %Include auto_generated/editorwidgets/qgshtmlwidgetwrapper.sip
+%If ( HAVE_QSCI_SIP )
 %Include auto_generated/editorwidgets/qgsjsoneditwidget.sip
+%End
 %Include auto_generated/editorwidgets/qgsmultiedittoolbutton.sip
 %Include auto_generated/editorwidgets/qgsrelationaggregatesearchwidgetwrapper.sip
 %Include auto_generated/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip

diff --git a/python/gui/auto_generated/editorwidgets/qgsjsoneditwidget.sip.in b/python/gui/auto_generated/editorwidgets/qgsjsoneditwidget.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsJsonEditWidget : QWidget
 {
 %Docstring(signature="appended")

diff --git a/src/gui/editorwidgets/qgsjsoneditwidget.h b/src/gui/editorwidgets/qgsjsoneditwidget.h
@@ -22,6 +22,8 @@
 #include "qgis_sip.h"
 #include "qgis_gui.h"
 
+SIP_IF_MODULE( HAVE_QSCI_SIP )
+
 /**
  * \ingroup gui
  * \class QgsJsonEditWidget
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,7 @@




		class QgsJsonEditWidget : QWidget
		{
		%Docstring(signature="appended")
Expand Down