Skip to content

Commit

Permalink
Remove support for SIP < 5.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@dvdkon
dvdkon committed Jan 27, 2025
1 parent 13b15b4 commit 3e99e0d
Show file tree
Hide file tree
Showing 64 changed files with 277 additions and 481 deletions.
4 changes: 2 additions & 2 deletions .ci/ogc/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ RUN apt-get update \
python3-pyqt5.qsci \
python3-all-dev \
python3-dev \
python3-sip-dev \
pyqt5-dev-tools \
spawn-fcgi
spawn-fcgi \
sip-tools

ADD qgis_mapserv.sh /root/qgis_mapserv.sh
CMD ["sh", "/root/qgis_mapserv.sh"]
4 changes: 2 additions & 2 deletions .docker/qgis3-qt5-build-deps.dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ RUN apt-get update \
python3-pyqt5.qtpositioning \
python3-pyqt5.qtmultimedia \
python3-pyqt5.qtserialport \
python3-sip \
python3-termcolor \
python3-yaml \
qpdf \
Expand All @@ -86,6 +85,7 @@ RUN apt-get update \
qt3d-scene2d-plugin \
qt5-image-formats-plugins \
saga \
sip-tools \
supervisor \
unzip \
xauth \
Expand Down Expand Up @@ -211,7 +211,7 @@ RUN apt-get update \
pyqt5.qsci-dev \
python3-all-dev \
python3-dev \
python3-sip-dev \
python3-pyqtbuild \
qt3d5-dev \
qt5keychain-dev \
qtbase5-dev \
Expand Down
24 changes: 12 additions & 12 deletions INSTALL.md
View file

Large diffs are not rendered by default.

27 changes: 12 additions & 15 deletions cmake/FindSIP.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,19 @@ ELSE(SIP_VERSION)
MESSAGE(STATUS "Found SIP version: ${SIP_VERSION_STR}")
ENDIF(NOT SIP_FIND_QUIETLY)

IF(${SIP_VERSION_STR} VERSION_LESS 5)
STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config})
STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config})
STRING(REGEX REPLACE ".*\nsip_module_dir:([^\n]+).*$" "\\1" SIP_MODULE_DIR ${sip_config})
if(${SIP_VERSION_STR} VERSION_LESS 5.0.0)
message(FATAL_ERROR "QGIS supports SIP 5.0.0 or later, version ${SIP_VERSION_STR} found")
endif()

FIND_PROGRAM(SIP_BUILD_EXECUTABLE sip-build)
IF(SIP_BUILD_EXECUTABLE)
IF(NOT SIP_FIND_QUIETLY)
MESSAGE(STATUS "Found sip-build executable: ${SIP_BUILD_EXECUTABLE}")
ENDIF(NOT SIP_FIND_QUIETLY)
SET(SIP_FOUND TRUE)
ELSE(${SIP_VERSION_STR} VERSION_LESS 5)
FIND_PROGRAM(SIP_BUILD_EXECUTABLE sip-build)
IF(SIP_BUILD_EXECUTABLE)
IF(NOT SIP_FIND_QUIETLY)
MESSAGE(STATUS "Found sip-build executable: ${SIP_BUILD_EXECUTABLE}")
ENDIF(NOT SIP_FIND_QUIETLY)
SET(SIP_FOUND TRUE)
ELSE(SIP_BUILD_EXECUTABLE)
MESSAGE (FATAL_ERROR "Could not find sip-build executable")
ENDIF(SIP_BUILD_EXECUTABLE)
ENDIF(${SIP_VERSION_STR} VERSION_LESS 5)
ELSE(SIP_BUILD_EXECUTABLE)
MESSAGE (FATAL_ERROR "Could not find sip-build executable")
ENDIF(SIP_BUILD_EXECUTABLE)
ENDIF(sip_config)

IF(NOT SIP_FOUND)
Expand Down
5 changes: 0 additions & 5 deletions cmake/SIPMacros.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,6 @@ MACRO(BUILD_SIP_PYTHON_MODULE MODULE_NAME SIP_FILES EXTRA_OBJECTS)
SET_PROPERTY(TARGET ${_logical_name} PROPERTY AUTOMOC OFF)
TARGET_INCLUDE_DIRECTORIES(${_logical_name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/${_module_path}/build)

IF (${SIP_VERSION_STR} VERSION_LESS 5.0.0)
# require c++14 only -- sip breaks with newer versions due to reliance on throw(...) annotations removed in c++17
TARGET_COMPILE_FEATURES(${_logical_name} PRIVATE cxx_std_14)
ENDIF (${SIP_VERSION_STR} VERSION_LESS 5.0.0)

SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES CXX_VISIBILITY_PRESET default)
TARGET_LINK_LIBRARIES(${_logical_name} Python::Python)
TARGET_LINK_LIBRARIES(${_logical_name} ${EXTRA_LINK_LIBRARIES})
Expand Down
2 changes: 1 addition & 1 deletion debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ Depends:
python3-pyqt5.qtsql,
python3-pyqt5.qtsvg,
python3-pyqt5.qtwebkit,
python3-sip,
python3-sipbuild,
python3-yaml,
${python3:Depends},
${shlibs:Depends},
Expand Down
2 changes: 1 addition & 1 deletion debian/control.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ Depends:
python3-pyqt5.qtsvg,
python3-pyqt5.qtwebkit,
python3-pyqt5.qtserialport,
python3-sip,
python3-sipbuild,
python3-yaml,
python3-lxml,
${python3:Depends},
Expand Down
59 changes: 14 additions & 45 deletions python/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,10 @@ endif()
# * prepend auto-generated Python signature to existing Docstrings
# * document template based classes
set(DOCSTRINGSTEMPLATE "//")
if(${SIP_VERSION_STR} VERSION_GREATER 4.19.6)
set(DEFAULTDOCSTRINGSIGNATURE "%DefaultDocstringSignature \"prepended\"")
set(DOCSTRINGSTEMPLATE "")
endif()
set(DEFAULTDOCSTRINGSIGNATURE "%DefaultDocstringSignature \"prepended\"")
set(DOCSTRINGSTEMPLATE "")

if(${SIP_VERSION_STR} VERSION_GREATER 4.19.0)
set(SIP_FINAL "final")
else()
set(SIP_FINAL "")
endif()
set(SIP_FINAL "final")

IF(BUILD_WITH_QT6)
SET(QSCI_SIP_MOD_NAME Qsci/qscimod6.sip)
Expand All @@ -96,13 +90,10 @@ set(QGIS_PYTHON_DIR ${Python_SITEARCH}/qgis)
# core module
file(GLOB_RECURSE sip_files_core ${BINDING_FILES_ROOT_DIR}/core/*.sip ${BINDING_FILES_ROOT_DIR}/core/*.sip.in)
set(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
set(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.core.api)
if((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11))
set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n ${PYQT_SIP_IMPORT})
endif()
set(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.core.api -n ${PYQT_SIP_IMPORT})
if(SIP_BUILD_EXECUTABLE)
install(FILES ${CMAKE_BINARY_DIR}/python/core/build/_core/_core.pyi DESTINATION ${QGIS_PYTHON_DIR})
elseif((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18))
else()
set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_core.pyi)
install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_core.pyi DESTINATION ${QGIS_PYTHON_DIR})
endif()
Expand Down Expand Up @@ -142,17 +133,7 @@ GENERATE_SIP_PYTHON_MODULE_CODE(qgis._core core/core.sip "${sip_files_core}" cpp
BUILD_SIP_PYTHON_MODULE(qgis._core core/core.sip ${cpp_files} "" qgis_core)
set(SIP_CORE_CPP_FILES ${cpp_files})

# TODO QGIS 4 : remove this hack when we switch completely to Qt 6 which supports only c++17
if( ${QT_VERSION_MAJOR} EQUAL 5 AND ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" ) )
# Bad hack to fix compilation with gcc 11 - for some reason it's ignoring
# the c++ standard version set for the target in BUILD_SIP_PYTHON_MODULE!
add_definitions(-std=c++14)
endif()

if((UNIX OR MINGW) AND SIP_VERSION_STR VERSION_GREATER_EQUAL 4.10 AND SIP_VERSION_STR VERSION_LESS 5.0)
set(SIP_EXTRA_OPTIONS -P ${SIP_EXTRA_OPTIONS})
add_definitions(-Dprotected=public)
elseif((UNIX OR MINGW) AND SIP_VERSION_STR VERSION_GREATER_EQUAL 5.0)
if(UNIX OR MINGW)
add_definitions(-Dprotected=public)
endif()

Expand All @@ -172,13 +153,10 @@ if (WITH_GUI)

file(GLOB_RECURSE sip_files_gui ${BINDING_FILES_ROOT_DIR}/gui/*.sip ${BINDING_FILES_ROOT_DIR}/gui/*.sip.in)
set(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui})
set(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
if((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11))
set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n ${PYQT_SIP_IMPORT})
endif()
set(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api -n ${PYQT_SIP_IMPORT})
if(SIP_BUILD_EXECUTABLE)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gui/build/_gui/_gui.pyi DESTINATION ${QGIS_PYTHON_DIR})
elseif((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18))
else()
set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi)
install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi DESTINATION ${QGIS_PYTHON_DIR})
endif()
Expand Down Expand Up @@ -206,13 +184,10 @@ if (WITH_3D)

file(GLOB_RECURSE sip_files_3d ${BINDING_FILES_ROOT_DIR}/3d/*.sip ${BINDING_FILES_ROOT_DIR}/3d/*.sip.in)
set(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_3d})
set(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.3d_p.api)
if((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11))
set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n ${PYQT_SIP_IMPORT})
endif()
set(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.3d_p.api -n ${PYQT_SIP_IMPORT})
if(SIP_BUILD_EXECUTABLE)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/3d/build/_3d_p/_3d_p.pyi DESTINATION ${QGIS_PYTHON_DIR})
elseif((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18))
else()
set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/3d_p.pyi)
install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_3d_p.pyi DESTINATION ${QGIS_PYTHON_DIR})
endif()
Expand All @@ -234,13 +209,10 @@ if (WITH_SERVER AND WITH_SERVER_PLUGINS)

file(GLOB_RECURSE sip_files_server ${BINDING_FILES_ROOT_DIR}/server/*.sip ${BINDING_FILES_ROOT_DIR}/server/*.sip.in)
set(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_server})
set(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.server.api)
if((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11))
set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n ${PYQT_SIP_IMPORT})
endif()
set(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.server.api -n ${PYQT_SIP_IMPORT})
if(SIP_BUILD_EXECUTABLE)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/server/build/_server/_server.pyi DESTINATION ${QGIS_PYTHON_DIR})
elseif((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18))
else()
set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_server.pyi)
install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_server.pyi DESTINATION ${QGIS_PYTHON_DIR})
endif()
Expand Down Expand Up @@ -271,13 +243,10 @@ if(WITH_ANALYSIS)
file(GLOB_RECURSE sip_files_analysis ${BINDING_FILES_ROOT_DIR}/analysis/*.sip ${BINDING_FILES_ROOT_DIR}/analysis/*.sip.in)

set(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis})
set(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api)
if((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11))
set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n ${PYQT_SIP_IMPORT})
endif()
set(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api -n ${PYQT_SIP_IMPORT})
if(SIP_BUILD_EXECUTABLE)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/analysis/build/_analysis/_analysis.pyi DESTINATION ${QGIS_PYTHON_DIR})
elseif((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18))
else()
set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_analysis.pyi)
install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_analysis.pyi DESTINATION ${QGIS_PYTHON_DIR})
endif()
Expand Down
3 changes: 1 addition & 2 deletions python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,7 @@ Subclasses need to implement the processGeometry method.
Creates a new single geometry check.
%End

virtual void collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback = 0, const QgsGeometryCheck::LayerFeatureIds &ids = QgsGeometryCheck::LayerFeatureIds() ) const ${SIP_FINAL};

void collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback = 0, const QgsGeometryCheck::LayerFeatureIds &ids = QgsGeometryCheck::LayerFeatureIds() ) const final;

virtual QList<QgsSingleGeometryCheckError *> processGeometry( const QgsGeometry &geometry ) const = 0;
%Docstring
Expand Down
3 changes: 1 addition & 2 deletions python/PyQt6/core/auto_generated/mesh/qgsmeshlayer.sip.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,7 @@ data.

virtual bool supportsEditing() const;

virtual QString loadDefaultStyle( bool &resultFlag /Out/ ) ${SIP_FINAL};

QString loadDefaultStyle( bool &resultFlag /Out/ ) final;

QString providerType() const;
%Docstring
Expand Down
9 changes: 3 additions & 6 deletions python/PyQt6/core/auto_generated/pointcloud/qgspointcloudlayer.sip.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,11 @@ Constructor - creates a point cloud layer

virtual bool readSymbology( const QDomNode &node, QString &errorMessage,
QgsReadWriteContext &context, StyleCategories categories = AllStyleCategories );
virtual bool readStyle( const QDomNode &node, QString &errorMessage, QgsReadWriteContext &context, StyleCategories categories = AllStyleCategories ) ${SIP_FINAL};

bool readStyle( const QDomNode &node, QString &errorMessage, QgsReadWriteContext &context, StyleCategories categories = AllStyleCategories ) final;

virtual bool writeSymbology( QDomNode &node, QDomDocument &doc, QString &errorMessage, const QgsReadWriteContext &context,
StyleCategories categories = AllStyleCategories ) const;
virtual bool writeStyle( QDomNode &node, QDomDocument &doc, QString &errorMessage, const QgsReadWriteContext &context, StyleCategories categories = AllStyleCategories ) const ${SIP_FINAL};

bool writeStyle( QDomNode &node, QDomDocument &doc, QString &errorMessage, const QgsReadWriteContext &context, StyleCategories categories = AllStyleCategories ) const final;

virtual void setTransformContext( const QgsCoordinateTransformContext &transformContext );

Expand All @@ -116,8 +114,7 @@ Constructor - creates a point cloud layer

virtual QString decodedSource( const QString &source, const QString &dataProvider, const QgsReadWriteContext &context ) const;

virtual QString loadDefaultStyle( bool &resultFlag /Out/ ) ${SIP_FINAL};

QString loadDefaultStyle( bool &resultFlag /Out/ ) final;
virtual QString htmlMetadata() const;

virtual QgsMapLayerElevationProperties *elevationProperties();
Expand Down
1 change: 0 additions & 1 deletion python/PyQt6/core/auto_generated/qgis.sip.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3661,7 +3661,6 @@ typedef unsigned long long qgssize;




QString geoWkt();
%Docstring
Wkt string that represents a geographic coord sys
Expand Down
3 changes: 0 additions & 3 deletions python/PyQt6/core/auto_generated/qgsfeature.sip.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ geometry and a list of field/values attributes.

%TypeHeaderCode
#include "qgsfeature.h"
#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
#define sipType_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
#endif
%End
public:
static const QMetaObject staticMetaObject;
Expand Down
3 changes: 1 addition & 2 deletions python/PyQt6/core/auto_generated/qgspropertycollection.sip.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,7 @@ priority over earlier collections.
Returns the number of collections contained within the stack.
%End

virtual void clear() ${SIP_FINAL};

void clear() final;
%Docstring
Removes all collections from the stack.
%End
Expand Down
6 changes: 2 additions & 4 deletions python/PyQt6/core/auto_generated/raster/qgsrasterlayer.sip.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,8 @@ In a world file, this is normally the first row (without the sign).
.. seealso:: :py:func:`rasterUnitsPerPixelX`
%End

virtual void setOpacity( double opacity ) ${SIP_FINAL};

virtual double opacity() const ${SIP_FINAL};

void setOpacity( double opacity ) final;
double opacity() const final;

void setContrastEnhancement( QgsContrastEnhancement::ContrastEnhancementAlgorithm algorithm,
Qgis::RasterRangeLimit limits = Qgis::RasterRangeLimit::MinimumMaximum,
Expand Down
6 changes: 2 additions & 4 deletions python/PyQt6/core/auto_generated/symbology/qgsfillsymbollayer.sip.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2579,8 +2579,7 @@ Caller takes ownership of the returned symbol layer.

virtual QgsSymbol *subSymbol();

virtual bool setSubSymbol( QgsSymbol *symbol /Transfer/ ) ${SIP_FINAL};

bool setSubSymbol( QgsSymbol *symbol /Transfer/ ) final;

virtual void setOutputUnit( Qgis::RenderUnit unit );

Expand Down Expand Up @@ -2770,8 +2769,7 @@ Caller takes ownership of the returned symbol layer.

virtual QgsSymbol *subSymbol();

virtual bool setSubSymbol( QgsSymbol *symbol /Transfer/ ) ${SIP_FINAL};

bool setSubSymbol( QgsSymbol *symbol /Transfer/ ) final;
virtual void setOutputUnit( Qgis::RenderUnit unit );

virtual Qgis::RenderUnit outputUnit() const;
Expand Down
12 changes: 4 additions & 8 deletions python/PyQt6/core/auto_generated/symbology/qgslinesymbollayer.sip.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -899,16 +899,12 @@ calculating individual symbol angles.

virtual void renderPolyline( const QPolygonF &points, QgsSymbolRenderContext &context );

virtual void renderPolygonStroke( const QPolygonF &points, const QVector<QPolygonF> *rings, QgsSymbolRenderContext &context ) ${SIP_FINAL};

virtual Qgis::RenderUnit outputUnit() const ${SIP_FINAL};

void renderPolygonStroke( const QPolygonF &points, const QVector<QPolygonF> *rings, QgsSymbolRenderContext &context ) final;
Qgis::RenderUnit outputUnit() const final;
virtual void setOutputUnit( Qgis::RenderUnit unit );

virtual void setMapUnitScale( const QgsMapUnitScale &scale ) ${SIP_FINAL};

virtual QgsMapUnitScale mapUnitScale() const ${SIP_FINAL};

void setMapUnitScale( const QgsMapUnitScale &scale ) final;
QgsMapUnitScale mapUnitScale() const final;
virtual QVariantMap properties() const;

virtual bool canCauseArtifactsBetweenAdjacentTiles() const;
Expand Down
9 changes: 3 additions & 6 deletions python/PyQt6/core/auto_generated/tiledscene/qgstiledscenelayer.sip.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,20 +68,17 @@ Constructor for QgsTiledSceneLayer.

virtual bool readSymbology( const QDomNode &node, QString &errorMessage,
QgsReadWriteContext &context, StyleCategories categories = AllStyleCategories );
virtual bool readStyle( const QDomNode &node, QString &errorMessage, QgsReadWriteContext &context, StyleCategories categories = AllStyleCategories ) ${SIP_FINAL};

bool readStyle( const QDomNode &node, QString &errorMessage, QgsReadWriteContext &context, StyleCategories categories = AllStyleCategories ) final;
virtual bool writeSymbology( QDomNode &node, QDomDocument &doc, QString &errorMessage, const QgsReadWriteContext &context,
StyleCategories categories = AllStyleCategories ) const;
virtual bool writeStyle( QDomNode &node, QDomDocument &doc, QString &errorMessage, const QgsReadWriteContext &context, StyleCategories categories = AllStyleCategories ) const ${SIP_FINAL};

bool writeStyle( QDomNode &node, QDomDocument &doc, QString &errorMessage, const QgsReadWriteContext &context, StyleCategories categories = AllStyleCategories ) const final;
virtual void setTransformContext( const QgsCoordinateTransformContext &transformContext );

virtual QString encodedSource( const QString &source, const QgsReadWriteContext &context ) const;

virtual QString decodedSource( const QString &source, const QString &dataProvider, const QgsReadWriteContext &context ) const;

virtual QString loadDefaultStyle( bool &resultFlag /Out/ ) ${SIP_FINAL};

QString loadDefaultStyle( bool &resultFlag /Out/ ) final;
virtual QString htmlMetadata() const;

virtual QgsMapLayerRenderer *createMapRenderer( QgsRenderContext &rendererContext ) /Factory/;
Expand Down
Loading

0 comments on commit 3e99e0d

Please sign in to comment.