@@ -4979,7 +4979,7 @@ static QVariant fcnTransformGeometry( const QVariantList &values, const QgsExpre
4979
4979
}
4980
4980
4981
4981
4982
- static QVariant fcnGetFeatureById ( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
4982
+ static QVariant fcnGetFeatureById ( const QVariantList &values, const QgsExpressionContext *context , QgsExpression *parent, const QgsExpressionNodeFunction * )
4983
4983
{
4984
4984
QVariant result;
4985
4985
QgsVectorLayer *vl = QgsExpressionUtils::getVectorLayer ( values.at ( 0 ), parent );
@@ -4991,6 +4991,8 @@ static QVariant fcnGetFeatureById( const QVariantList &values, const QgsExpressi
4991
4991
req.setFilterFid ( fid );
4992
4992
req.setTimeout ( 10000 );
4993
4993
req.setRequestMayBeNested ( true );
4994
+ if ( context )
4995
+ req.setFeedback ( context->feedback () );
4994
4996
QgsFeatureIterator fIt = vl->getFeatures ( req );
4995
4997
4996
4998
QgsFeature fet;
@@ -5034,6 +5036,8 @@ static QVariant fcnGetFeature( const QVariantList &values, const QgsExpressionCo
5034
5036
req.setLimit ( 1 );
5035
5037
req.setTimeout ( 10000 );
5036
5038
req.setRequestMayBeNested ( true );
5039
+ if ( context )
5040
+ req.setFeedback ( context->feedback () );
5037
5041
if ( !parent->needsGeometry () )
5038
5042
{
5039
5043
req.setFlags ( QgsFeatureRequest::NoGeometry );
@@ -6069,6 +6073,8 @@ static QVariant executeGeomOverlay( const QVariantList &values, const QgsExpress
6069
6073
QgsFeatureRequest request;
6070
6074
request.setTimeout ( 10000 );
6071
6075
request.setRequestMayBeNested ( true );
6076
+ if ( context )
6077
+ request.setFeedback ( context->feedback () );
6072
6078
6073
6079
// First parameter is the overlay layer
6074
6080
QgsExpressionNode *node = QgsExpressionUtils::getNode ( values.at ( 0 ), parent );
@@ -6282,6 +6288,8 @@ static QVariant executeGeomOverlay( const QVariantList &values, const QgsExpress
6282
6288
QgsFeature feat2;
6283
6289
QgsFeatureRequest request2;
6284
6290
request2.setLimit ( limit );
6291
+ if ( context )
6292
+ request2.setFeedback ( context->feedback () );
6285
6293
QgsFeatureIterator fi = targetLayer->getFeatures ( request2 );
6286
6294
while ( fi.nextFeature ( feat2 ) )
6287
6295
{
0 commit comments