Merge pull request #61870 from jef-n/fix-non-unity

rouault · web-flow · commit d67afeae411c · 2025-05-16T18:02:33.000+01:00
fix non-unity builds like msvc nightly
diff --git a/python/PyQt6/core/auto_generated/qgssqlstatement.sip.in b/python/PyQt6/core/auto_generated/qgssqlstatement.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsSQLStatement
 {
 %Docstring(signature="appended")
diff --git a/python/core/auto_generated/qgssqlstatement.sip.in b/python/core/auto_generated/qgssqlstatement.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsSQLStatement
 {
 %Docstring(signature="appended")
diff --git a/src/core/dxf/qgsdxfpaintdevice.h b/src/core/dxf/qgsdxfpaintdevice.h
@@ -20,6 +20,8 @@
 
 #define SIP_NO_FILE
 
+#include <memory>
+
 #include <QPaintDevice>
 
 #include "qgis_core.h"
diff --git a/src/core/qgssqlstatement.h b/src/core/qgssqlstatement.h
@@ -17,6 +17,8 @@
 #ifndef QGSSQLSTATEMENT_H
 #define QGSSQLSTATEMENT_H
 
+#include <memory>
+
 #include <QCoreApplication>
 #include "qgis_sip.h"
 #include <QMetaType>
diff --git a/src/gui/qgsgpstoolsinterface.h b/src/gui/qgsgpstoolsinterface.h
@@ -15,6 +15,7 @@
 #ifndef QGSGPSTOOLSINTERFACE_H
 #define QGSGPSTOOLSINTERFACE_H
 
+#include "qgis_sip.h"
 #include "qgis_gui.h"
 
 class QgsGpsConnection;

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`
`11`	`11`
	`12`	`+`
`12`	`13`	`class QgsSQLStatement`
`13`	`14`	`{`
`14`	`15`	`%Docstring(signature="appended")`