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

fix build with sip 4.18.1 (eg. ubuntu artful)

Browse Source
This commit is contained in:
Juergen E. Fischer 2018-06-27 23:24:56 +02:00
parent a65279629c
commit d0e94728d8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/auto_generated/qgsvectordataprovider.sip.in Executable file → Normal file
View File

@ -131,7 +131,7 @@ Returns true if the layer contains at least one feature.
.. versionadded:: 3.4 .. versionadded:: 3.4
%End %End
virtual QgsFeatureSource::FeatureAvailability hasFeatures() const final; virtual QgsFeatureSource::FeatureAvailability hasFeatures() const;
%Docstring %Docstring
Will always return FeatureAvailability.FeaturesAvailable or Will always return FeatureAvailability.FeaturesAvailable or
FeatureAvailability.NoFeaturesAvailable. FeatureAvailability.NoFeaturesAvailable.

1
scripts/sipify.pl
View File

@ -958,6 +958,7 @@ while ($LINE_IDX < $LINE_COUNT){
do {no warnings 'uninitialized'; do {no warnings 'uninitialized';
$LINE =~ s/^(\s*template\s*<)(?:class|typename) (\w+>)(.*)$/$1$2$3/; $LINE =~ s/^(\s*template\s*<)(?:class|typename) (\w+>)(.*)$/$1$2$3/;
$LINE =~ s/\s*\boverride\b//; $LINE =~ s/\s*\boverride\b//;
$LINE =~ s/\s*\bfinal\b//;
$LINE =~ s/\s*\bextern \b//; $LINE =~ s/\s*\bextern \b//;
$LINE =~ s/\s*\bMAYBE_UNUSED \b//; $LINE =~ s/\s*\bMAYBE_UNUSED \b//;
$LINE =~ s/\s*\bNODISCARD \b//; $LINE =~ s/\s*\bNODISCARD \b//;