fix build with sip 4.18.1 (eg. ubuntu artful)

qgis · Jun 27, 2018 · d0e9472 · d0e9472
1 parent a652796
commit d0e9472
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/python/core/auto_generated/qgsvectordataprovider.sip.in b/python/core/auto_generated/qgsvectordataprovider.sip.in
@@ -131,7 +131,7 @@ Returns true if the layer contains at least one feature.
 .. versionadded:: 3.4
 %End
 
-    virtual QgsFeatureSource::FeatureAvailability hasFeatures() const final;
+    virtual QgsFeatureSource::FeatureAvailability hasFeatures() const;
 %Docstring
 Will always return FeatureAvailability.FeaturesAvailable or
 FeatureAvailability.NoFeaturesAvailable.

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