Merge pull request #30757 from nyalldawson/override_clear

Always show 'clear' action in property override button
qgis · Jul 17, 2019 · 93cd832 · 93cd832
2 parents 9f219e0 + 48c21bb
commit 93cd832
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/gui/qgspropertyoverridebutton.cpp b/src/gui/qgspropertyoverridebutton.cpp
@@ -529,14 +529,19 @@ void QgsPropertyOverrideButton::aboutToShowMenu()
     mDefineMenu->addAction( mActionExpDialog );
     mDefineMenu->addAction( mActionCopyExpr );
     mDefineMenu->addAction( mActionPasteExpr );
-    mDefineMenu->addAction( mActionClearExpr );
   }
   else
   {
     mDefineMenu->addAction( mActionExpDialog );
     mDefineMenu->addAction( mActionPasteExpr );
   }
 
+  if ( hasExp || !mFieldName.isEmpty() )
+  {
+    mDefineMenu->addSeparator();
+    mDefineMenu->addAction( mActionClearExpr );
+  }
+
   if ( !mDefinition.name().isEmpty() && mDefinition.supportsAssistant() )
   {
     mDefineMenu->addSeparator();