sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix windows build take 2

Browse Source
This commit is contained in:
Denis Rouzaud 2024-12-05 15:58:53 +01:00 committed by Nyall Dawson
parent a0d1152d99
commit 8c4b08dc07
16 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/sipify.py
View File

@ -1479,7 +1479,7 @@ while CONTEXT.line_idx < CONTEXT.line_count:
dbg_info("found SIP_WHEN_FEATURE")
CONTEXT.if_feature_condition = match.group(1)
match = re.search(r"SIP_TYPEHEADER_INCLUDE\(\s*(.*?)\s*\)", CONTEXT.current_line)
match = re.search(r'SIP_TYPEHEADER_INCLUDE\(\s*"(.*?)"\s*\)', CONTEXT.current_line)
if match:
dbg_info("found SIP_TYPEHEADER_INCLUDE")
write_output("STI", f'#include "{match.group(1)}"\n')

2
src/analysis/raster/qgsalignraster.h
View File

@ -43,7 +43,7 @@ typedef void *GDALDatasetH SIP_SKIP;
*/
class ANALYSIS_EXPORT QgsAlignRaster
{
SIP_TYPEHEADER_INCLUDE( gdal_version.h );
SIP_TYPEHEADER_INCLUDE( "gdal_version.h" );
public:

12
src/core/browser/qgsdataitem.h
View File

@ -44,12 +44,12 @@ typedef QgsDataItem *dataItem_t( QString, QgsDataItem * ) SIP_SKIP;
*/
class CORE_EXPORT QgsDataItem : public QObject
{
SIP_TYPEHEADER_INCLUDE( qgslayeritem.h );
SIP_TYPEHEADER_INCLUDE( qgsdirectoryitem.h );
SIP_TYPEHEADER_INCLUDE( qgsfavoritesitem.h );
SIP_TYPEHEADER_INCLUDE( qgszipitem.h );
SIP_TYPEHEADER_INCLUDE( qgsdatacollectionitem.h );
SIP_TYPEHEADER_INCLUDE( qgsprojectitem.h );
SIP_TYPEHEADER_INCLUDE( "qgslayeritem.h" );
SIP_TYPEHEADER_INCLUDE( "qgsdirectoryitem.h" );
SIP_TYPEHEADER_INCLUDE( "qgsfavoritesitem.h" );
SIP_TYPEHEADER_INCLUDE( "qgszipitem.h" );
SIP_TYPEHEADER_INCLUDE( "qgsdatacollectionitem.h" );
SIP_TYPEHEADER_INCLUDE( "qgsprojectitem.h" );
#ifdef SIP_RUN
SIP_CONVERT_TO_SUBCLASS_CODE

4
src/core/gps/qgsgpsconnection.h
View File

@ -48,8 +48,8 @@ template<class T> class QgsSettingsEntryEnumFlag;
*/
class CORE_EXPORT QgsGpsConnection : public QObject
{
SIP_TYPEHEADER_INCLUDE( qgsgpsdconnection.h );
SIP_TYPEHEADER_INCLUDE( qgsnmeaconnection.h );
SIP_TYPEHEADER_INCLUDE( "qgsgpsdconnection.h" );
SIP_TYPEHEADER_INCLUDE( "qgsnmeaconnection.h" );
#ifdef SIP_RUN

2
src/core/layertree/qgslayertreemodellegendnode.h
View File

@ -50,7 +50,7 @@ class QgsTextDocumentMetrics;
*/
class CORE_EXPORT QgsLayerTreeModelLegendNode : public QObject
{
SIP_TYPEHEADER_INCLUDE( qgscolorramplegendnode.h );
SIP_TYPEHEADER_INCLUDE( "qgscolorramplegendnode.h" );
#ifdef SIP_RUN
SIP_CONVERT_TO_SUBCLASS_CODE

26
src/core/layout/qgslayoutitem.h
View File

@ -105,19 +105,19 @@ class CORE_EXPORT QgsLayoutItemRenderContext
*/
class CORE_EXPORT QgsLayoutItem : public QgsLayoutObject, public QGraphicsRectItem, public QgsLayoutUndoObjectInterface
{
SIP_TYPEHEADER_INCLUDE( qgslayoutitemgroup.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemmap.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitempicture.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemlabel.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemlegend.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitempolygon.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitempolyline.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemscalebar.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutframe.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemshape.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitempage.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemmarker.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemelevationprofile.h );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemgroup.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemmap.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitempicture.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemlabel.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemlegend.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitempolygon.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitempolyline.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemscalebar.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutframe.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemshape.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitempage.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemmarker.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemelevationprofile.h" );
#ifdef SIP_RUN
SIP_CONVERT_TO_SUBCLASS_CODE

8
src/core/layout/qgslayoutmultiframe.h
View File

@ -46,10 +46,10 @@ class QgsLayoutItemRenderContext;
class CORE_EXPORT QgsLayoutMultiFrame: public QgsLayoutObject, public QgsLayoutUndoObjectInterface
{
SIP_TYPEHEADER_INCLUDE( qgslayoutitemhtml.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemattributetable.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemmanualtable.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemtexttable.h );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemhtml.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemattributetable.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemmanualtable.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemtexttable.h" );
#ifdef SIP_RUN
SIP_CONVERT_TO_SUBCLASS_CODE

28
src/core/layout/qgslayoutobject.h
View File

@ -37,20 +37,20 @@ class QgsReadWriteContext;
*/
class CORE_EXPORT QgsLayoutObject: public QObject, public QgsExpressionContextGenerator
{
SIP_TYPEHEADER_INCLUDE( qgslayoutitem.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemgroup.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemmap.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitempicture.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemlabel.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemlegend.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitempolygon.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitempolyline.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemscalebar.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutframe.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemshape.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitempage.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemmarker.h );
SIP_TYPEHEADER_INCLUDE( qgslayoutitemelevationprofile.h );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitem.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemgroup.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemmap.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitempicture.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemlabel.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemlegend.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitempolygon.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitempolyline.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemscalebar.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutframe.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemshape.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitempage.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemmarker.h" );
SIP_TYPEHEADER_INCLUDE( "qgslayoutitemelevationprofile.h" );
#ifdef SIP_RUN
SIP_CONVERT_TO_SUBCLASS_CODE

10
src/core/qgsmaplayerelevationproperties.h
View File

@ -43,11 +43,11 @@ class QgsMapLayer;
*/
class CORE_EXPORT QgsMapLayerElevationProperties : public QObject
{
SIP_TYPEHEADER_INCLUDE( qgspointcloudlayerelevationproperties.h );
SIP_TYPEHEADER_INCLUDE( qgsrasterlayerelevationproperties.h );
SIP_TYPEHEADER_INCLUDE( qgsvectorlayerelevationproperties.h );
SIP_TYPEHEADER_INCLUDE( qgsmeshlayerelevationproperties.h );
SIP_TYPEHEADER_INCLUDE( qgstiledscenelayerelevationproperties.h );
SIP_TYPEHEADER_INCLUDE( "qgspointcloudlayerelevationproperties.h" );
SIP_TYPEHEADER_INCLUDE( "qgsrasterlayerelevationproperties.h" );
SIP_TYPEHEADER_INCLUDE( "qgsvectorlayerelevationproperties.h" );
SIP_TYPEHEADER_INCLUDE( "qgsmeshlayerelevationproperties.h" );
SIP_TYPEHEADER_INCLUDE( "qgstiledscenelayerelevationproperties.h" );
Q_OBJECT
#ifdef SIP_RUN

2
src/core/qgsmaplayerselectionproperties.h
View File

@ -36,7 +36,7 @@
*/
class CORE_EXPORT QgsMapLayerSelectionProperties : public QObject
{
SIP_TYPEHEADER_INCLUDE( qgsvectorlayerselectionproperties.h );
SIP_TYPEHEADER_INCLUDE( "qgsvectorlayerselectionproperties.h" );
Q_OBJECT

6
src/core/qgsmaplayertemporalproperties.h
View File

@ -42,9 +42,9 @@ class QgsDataProviderTemporalCapabilities;
*/
class CORE_EXPORT QgsMapLayerTemporalProperties : public QgsTemporalProperty
{
SIP_TYPEHEADER_INCLUDE( qgsrasterlayertemporalproperties.h );
SIP_TYPEHEADER_INCLUDE( qgsmeshlayertemporalproperties.h );
SIP_TYPEHEADER_INCLUDE( qgsvectorlayertemporalproperties.h );
SIP_TYPEHEADER_INCLUDE( "qgsrasterlayertemporalproperties.h" );
SIP_TYPEHEADER_INCLUDE( "qgsmeshlayertemporalproperties.h" );
SIP_TYPEHEADER_INCLUDE( "qgsvectorlayertemporalproperties.h" );
Q_OBJECT

30
src/core/raster/qgsrasterinterface.h
View File

@ -135,22 +135,22 @@ class CORE_EXPORT QgsRasterBlockFeedback : public QgsFeedback
class CORE_EXPORT QgsRasterInterface
{
// QgsRasterInterface subclasses
SIP_TYPEHEADER_INCLUDE( qgsbrightnesscontrastfilter.h );
SIP_TYPEHEADER_INCLUDE( qgshuesaturationfilter.h );
SIP_TYPEHEADER_INCLUDE( qgsrasterdataprovider.h );
SIP_TYPEHEADER_INCLUDE( qgsrasternuller.h );
SIP_TYPEHEADER_INCLUDE( qgsrasterprojector.h );
SIP_TYPEHEADER_INCLUDE( qgsrasterrenderer.h );
SIP_TYPEHEADER_INCLUDE( qgsrasterresamplefilter.h );
SIP_TYPEHEADER_INCLUDE( "qgsbrightnesscontrastfilter.h" );
SIP_TYPEHEADER_INCLUDE( "qgshuesaturationfilter.h" );
SIP_TYPEHEADER_INCLUDE( "qgsrasterdataprovider.h" );
SIP_TYPEHEADER_INCLUDE( "qgsrasternuller.h" );
SIP_TYPEHEADER_INCLUDE( "qgsrasterprojector.h" );
SIP_TYPEHEADER_INCLUDE( "qgsrasterrenderer.h" );
SIP_TYPEHEADER_INCLUDE( "qgsrasterresamplefilter.h" );
// QgsRasterRenderer subclasses
SIP_TYPEHEADER_INCLUDE( qgshillshaderenderer.h );
SIP_TYPEHEADER_INCLUDE( qgsmultibandcolorrenderer.h );
SIP_TYPEHEADER_INCLUDE( qgspalettedrasterrenderer.h );
SIP_TYPEHEADER_INCLUDE( qgssinglebandcolordatarenderer.h );
SIP_TYPEHEADER_INCLUDE( qgssinglebandgrayrenderer.h );
SIP_TYPEHEADER_INCLUDE( qgssinglebandpseudocolorrenderer.h );
SIP_TYPEHEADER_INCLUDE( qgsrastersinglecolorrenderer.h );
SIP_TYPEHEADER_INCLUDE( qgsrastercontourrenderer.h );
SIP_TYPEHEADER_INCLUDE( "qgshillshaderenderer.h" );
SIP_TYPEHEADER_INCLUDE( "qgsmultibandcolorrenderer.h" );
SIP_TYPEHEADER_INCLUDE( "qgspalettedrasterrenderer.h" );
SIP_TYPEHEADER_INCLUDE( "qgssinglebandcolordatarenderer.h" );
SIP_TYPEHEADER_INCLUDE( "qgssinglebandgrayrenderer.h" );
SIP_TYPEHEADER_INCLUDE( "qgssinglebandpseudocolorrenderer.h" );
SIP_TYPEHEADER_INCLUDE( "qgsrastersinglecolorrenderer.h" );
SIP_TYPEHEADER_INCLUDE( "qgsrastercontourrenderer.h" );
#ifdef SIP_RUN

4
src/core/raster/qgsrasterresampler.h
View File

@ -32,8 +32,8 @@ class QSize;
*/
class CORE_EXPORT QgsRasterResampler
{
SIP_TYPEHEADER_INCLUDE( qgsbilinearrasterresampler.h );
SIP_TYPEHEADER_INCLUDE( qgscubicrasterresampler.h );
SIP_TYPEHEADER_INCLUDE( "qgsbilinearrasterresampler.h" );
SIP_TYPEHEADER_INCLUDE( "qgscubicrasterresampler.h" );
#ifdef SIP_RUN

2
src/core/raster/qgsrastershaderfunction.h
View File

@ -33,7 +33,7 @@ email : ersts@amnh.org
class CORE_EXPORT QgsRasterShaderFunction
{
SIP_TYPEHEADER_INCLUDE( qgscolorrampshader.h );
SIP_TYPEHEADER_INCLUDE( "qgscolorrampshader.h" );
#ifdef SIP_RUN

4
src/core/sensor/qgsabstractsensor.h
View File

@ -32,8 +32,8 @@
*/
class CORE_EXPORT QgsAbstractSensor : public QObject
{
SIP_TYPEHEADER_INCLUDE( qgsiodevicesensor.h );
SIP_TYPEHEADER_INCLUDE( qgssensorregistry.h );
SIP_TYPEHEADER_INCLUDE( "qgsiodevicesensor.h" );
SIP_TYPEHEADER_INCLUDE( "qgssensorregistry.h" );
#ifdef SIP_RUN

2
src/core/symbology/qgssymbollayer.h
View File

@ -53,7 +53,7 @@ typedef QMap<QString, QString> QgsStringMap;
*/
class CORE_EXPORT QgsSymbolLayer
{
SIP_TYPEHEADER_INCLUDE( qgslinesymbollayer.h );
SIP_TYPEHEADER_INCLUDE( "qgslinesymbollayer.h" );
#ifdef SIP_RUN