From 9626f589fb9a4070e2a2c149a855dd1fc4312a8d Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Thu, 8 Sep 2016 12:16:17 +0200 Subject: [PATCH] Add all applicable scopes for editor widget constraint validation --- src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp index d6231a8da6b..5e229c7d85a 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp +++ b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp @@ -117,11 +117,9 @@ void QgsEditorWidgetWrapper::updateConstraint( const QgsFeature &ft ) { description = layer()->editFormConfig().expressionDescription( mFieldIdx ); - QgsExpressionContext context = - QgsExpressionContextUtils::createFeatureBasedContext( ft, ft.fields() ); - context << QgsExpressionContextUtils::layerScope( layer() ); - + QgsExpressionContext context = layer()->createExpressionContext(); context.setFeature( ft ); + QgsExpression expr( expression ); mValidConstraint = expr.evaluate( &context ).toBool();