Show NULL preview text in expression editor

Makes creating/debugging expressions easier for users (cherry-picked from 1f3723)
qgis · Jan 11, 2017 · cfc3a86 · cfc3a86
1 parent 1eb3bfc
commit cfc3a86
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -5207,6 +5207,10 @@ QString QgsExpression::formatPreviewString( const QVariant& value )
     else
       return tr( "<i>&lt;geometry: %1&gt;</i>" ).arg( QgsWKBTypes::displayString( geom.geometry()->wkbType() ) );
   }
+  else if ( !value.isValid() )
+  {
+    return tr( "<i>NULL</i>" );
+  }
   else if ( value.canConvert< QgsFeature >() )
   {
     //result is a feature