sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-15 00:02:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

[PyQt6] s/SIP_PYQT5_ONLY/SIP_PYQT5_RUN

Browse Source
This commit is contained in:
Julien Cabieces 2023-12-21 09:08:09 +01:00 committed by Nyall Dawson
parent fa6ab5c9a9
commit 54fd608304
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/sipify.pl
View File

@ -668,7 +668,7 @@ while ($LINE_IDX < $LINE_COUNT){
}
# do not PYQT5 code if we are in qt6
if ( $is_qt6 && $LINE =~ m/^\s*#ifdef SIP_PYQT5_ONLY/){
if ( $is_qt6 && $LINE =~ m/^\s*#ifdef SIP_PYQT5_RUN/){
dbg_info("do not process PYQT5 code");
while ( $LINE !~ m/^#endif/ ){
$LINE = read_line();

2
src/core/qgis_sip.h
View File

@ -275,7 +275,7 @@
/*
* Directive to indicate that following code is only available with Qt 5 version
*/
#define SIP_PYQT5_ONLY
#define SIP_PYQT5_RUN
#endif // QGIS_SIP_H

4
src/core/qgsjsonutils.h
View File

@ -315,7 +315,7 @@ class CORE_EXPORT QgsJsonUtils
* \see stringToFields()
* \note this function is a wrapper around QgsOgrUtils::stringToFeatureList()
*/
#ifdef SIP_PYQT5_ONLY
#ifdef SIP_PYQT5_RUN
static QgsFeatureList stringToFeatureList( const QString &string, const QgsFields &fields = QgsFields(), QTextCodec *encoding = nullptr );
#endif
@ -326,7 +326,7 @@ class CORE_EXPORT QgsJsonUtils
* \see stringToFeatureList()
* \note this function is a wrapper around QgsOgrUtils::stringToFields()
*/
#ifdef SIP_PYQT5_ONLY
#ifdef SIP_PYQT5_RUN
static QgsFields stringToFields( const QString &string, QTextCodec *encoding = nullptr );
#endif

2
src/core/vector/qgsvectordataprovider.h
View File

@ -685,7 +685,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider, public QgsFeat
*/
void setNativeTypes( const QList<QgsVectorDataProvider::NativeType> &nativeTypes );
#ifdef SIP_PYQT5_ONLY
#ifdef SIP_PYQT5_RUN
/**
* Gets this providers encoding