QVariant supports boolean

m-kuhn · m-kuhn · commit 34a792ffdcf1 · 2019-03-10T17:27:50.000+01:00
diff --git a/src/core/qgsrulebasedlabeling.cpp b/src/core/qgsrulebasedlabeling.cpp
@@ -370,7 +370,7 @@ bool QgsRuleBasedLabeling::Rule::isFilterOK( const QgsFeature &f, QgsRenderConte
 
   context.expressionContext().setFeature( f );
   QVariant res = mFilter->evaluate( &context.expressionContext() );
-  return res.toInt() != 0;
+  return res.toBool();
 }
 
 bool QgsRuleBasedLabeling::Rule::isScaleOK( double scale ) const

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ bool QgsRuleBasedLabeling::Rule::isFilterOK( const QgsFeature &f, QgsRenderConte`
`370`	`370`
`371`	`371`	`context.expressionContext().setFeature( f );`
`372`	`372`	`QVariant res = mFilter->evaluate( &context.expressionContext() );`
`373`		`- return res.toInt() != 0;`
	`373`	`+ return res.toBool();`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`bool QgsRuleBasedLabeling::Rule::isScaleOK( double scale ) const`