diff --git a/python/core/processing/qgsprocessingalgorithm.sip b/python/core/processing/qgsprocessingalgorithm.sip index 683cb5c9dc0..93ee5b79f2b 100644 --- a/python/core/processing/qgsprocessingalgorithm.sip +++ b/python/core/processing/qgsprocessingalgorithm.sip @@ -27,7 +27,7 @@ class QgsProcessingAlgorithm FlagHideFromToolbox, FlagHideFromModeler, FlagSupportsBatch, - FlagDeprecated + FlagDeprecated, }; typedef QFlags Flags; diff --git a/scripts/sipify.pl b/scripts/sipify.pl index 8524a4fd6d7..050bca8a65d 100755 --- a/scripts/sipify.pl +++ b/scripts/sipify.pl @@ -289,7 +289,7 @@ while(!eof $header){ if ($line =~ m/\};/){ last; } - $line =~ s/(\s*\w+)(\s*=\s*[\w\s\d<]+.*?)?(,?).*$/$1$3/; + $line =~ s/(\s*\w+)(\s*=\s*[\w\s\d<|]+.*?)?(,?).*$/$1$3/; print $line; } print $line; diff --git a/tests/scripts/sipifyheader.expected.sip b/tests/scripts/sipifyheader.expected.sip index cc29b88ac1f..b7d12cceac2 100644 --- a/tests/scripts/sipifyheader.expected.sip +++ b/tests/scripts/sipifyheader.expected.sip @@ -64,6 +64,7 @@ class QgsSipifyHeader : QtClass NoSuccess, ImaginarySuccess, RecursiveSuccess, + SuccessCombination, }; typedef QFlags Flags; diff --git a/tests/scripts/sipifyheader.h b/tests/scripts/sipifyheader.h index daf3eb4e0b8..aee6c77e5ac 100644 --- a/tests/scripts/sipifyheader.h +++ b/tests/scripts/sipifyheader.h @@ -102,6 +102,7 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass, private Ui::QgsBas NoSuccess = 1, //!< Edit operation resulted in an empty geometry ImaginarySuccess = 1 << 3, //!< Edit operation resulted in an imaginary geometry RecursiveSuccess = 1 << 4, //!< Edit operation resulted in an n-dimensional wormhole + SuccessCombination = Success | ImaginarySuccess, //!< Holy Graal }; Q_DECLARE_FLAGS( Flags, MyEnum )