Fix missing definition in data defined buttons

Fixes #19110
qgis · Jun 8, 2018 · f6fa022 · f6fa022
1 parent da89f18
commit f6fa022
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/gui/qgspropertyoverridebutton.cpp b/src/gui/qgspropertyoverridebutton.cpp
@@ -690,6 +690,10 @@ void QgsPropertyOverrideButton::updateGui()
       icon = QgsApplication::getThemeIcon( QStringLiteral( "/mIconDataDefineExpressionError.svg" ) );
       deftip = tr( "Parse error: %1" ).arg( exp.parserErrorString() );
     }
+    else
+    {
+      deftip = mExpressionString;
+    }
   }
   else if ( mProperty.propertyType() != QgsProperty::ExpressionBasedProperty && hasField )
   {
@@ -700,6 +704,10 @@ void QgsPropertyOverrideButton::updateGui()
       icon = QgsApplication::getThemeIcon( QStringLiteral( "/mIconDataDefineError.svg" ) );
       deftip = tr( "'%1' field missing" ).arg( mFieldName );
     }
+    else
+    {
+      deftip = mFieldName;
+    }
   }
 
   setIcon( icon );
@@ -724,7 +732,7 @@ void QgsPropertyOverrideButton::updateGui()
     mFullDescription += tr( "<b>Valid input types:</b><br>%1<br>" ).arg( mDataTypesString );
   }
 
-  QString deftype( QLatin1String( "" ) );
+  QString deftype;
   if ( deftip != tr( "undefined" ) )
   {
     deftype = QStringLiteral( " (%1)" ).arg( mProperty.propertyType() == QgsProperty::ExpressionBasedProperty ? tr( "expression" ) : tr( "field" ) );