Also set correct expression context on feature request

(cherry picked from commit ba5692c)
qgis · Jun 21, 2021 · 7f57c8b · 7f57c8b
1 parent a232222
commit 7f57c8b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/src/app/qgsmaptoolselectutils.cpp b/src/app/qgsmaptoolselectutils.cpp
@@ -287,6 +287,7 @@ QgsFeatureIds QgsMapToolSelectUtils::getMatchingFeatures( QgsMapCanvas *canvas,
     }
   }
 
+  request.setExpressionContext( context.expressionContext() );
   QgsFeatureIterator fit = vlayer->getFeatures( request );
 
   QgsFeature f;

diff --git a/src/app/vertextool/qgsvertextool.cpp b/src/app/vertextool/qgsvertextool.cpp
@@ -584,6 +584,7 @@ void QgsVertexTool::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
         request.setSubsetOfAttributes( r->usedAttributes( context ), vlayer->fields() );
       else
         request.setNoAttributes();
+      request.setExpressionContext( context.expressionContext() );
 
       QgsFeature f;
       QgsFeatureIterator fi = vlayer->getFeatures( request );

diff --git a/src/gui/qgsmaptip.cpp b/src/gui/qgsmaptip.cpp
@@ -256,6 +256,7 @@ QString QgsMapTip::fetchFeature( QgsMapLayer *layer, QgsPointXY &mapPosition, Qg
       request.combineFilterExpression( filterExpression );
     }
   }
+  request.setExpressionContext( renderCtx.expressionContext() );
 
   QgsFeatureIterator it = vlayer->getFeatures( request );
   QElapsedTimer timer;