Merge remote-tracking branch 'origin/Applications/16.08'

src/search/widgethandler/headersrulerwidgethandler.cpp

@@ -211,6 +211,8 @@ void HeadersRuleWidgetHandler::reset(QStackedWidget *functionStack,
         lineEdit->blockSignals(true);
         lineEdit->clear();
         lineEdit->blockSignals(false);
+        lineEdit->setClearButtonEnabled(false);
+        lineEdit->setClearButtonEnabled(true);
         valueStack->setCurrentWidget(lineEdit);
     }
 
@@ -266,6 +268,8 @@ bool HeadersRuleWidgetHandler::setRule(QStackedWidget *functionStack,
             lineEdit->blockSignals(true);
             lineEdit->setText(rule->contents());
             lineEdit->blockSignals(false);
+            lineEdit->setClearButtonEnabled(false);
+            lineEdit->setClearButtonEnabled(true);
             valueStack->setCurrentWidget(lineEdit);
         }
     }

src/search/widgethandler/messagerulewidgethandler.cpp

@@ -201,6 +201,8 @@ void MessageRuleWidgetHandler::reset(QStackedWidget *functionStack,
         lineEdit->blockSignals(true);
         lineEdit->clear();
         lineEdit->blockSignals(false);
+        lineEdit->setClearButtonEnabled(false);
+        lineEdit->setClearButtonEnabled(true);
         valueStack->setCurrentWidget(lineEdit);
     }
 }
@@ -255,6 +257,8 @@ bool MessageRuleWidgetHandler::setRule(QStackedWidget *functionStack,
             lineEdit->blockSignals(true);
             lineEdit->setText(rule->contents());
             lineEdit->blockSignals(false);
+            lineEdit->setClearButtonEnabled(false);
+            lineEdit->setClearButtonEnabled(true);
             valueStack->setCurrentWidget(lineEdit);
         }
     }

src/search/widgethandler/tagrulewidgethandler.cpp

@@ -264,6 +264,8 @@ void TagRuleWidgetHandler::reset(QStackedWidget *functionStack,
         lineEdit->blockSignals(true);
         lineEdit->clear();
         lineEdit->blockSignals(false);
+        lineEdit->setClearButtonEnabled(false);
+        lineEdit->setClearButtonEnabled(true);
         valueStack->setCurrentWidget(lineEdit);
     }
 
@@ -326,6 +328,8 @@ bool TagRuleWidgetHandler::setRule(QStackedWidget *functionStack,
             lineEdit->blockSignals(true);
             lineEdit->setText(rule->contents());
             lineEdit->blockSignals(false);
+            lineEdit->setClearButtonEnabled(false);
+            lineEdit->setClearButtonEnabled(true);
             valueStack->setCurrentWidget(lineEdit);
         }
     } else {

src/search/widgethandler/textrulerwidgethandler.cpp

@@ -183,6 +183,8 @@ void TextRuleWidgetHandler::reset(QStackedWidget *functionStack,
         lineEdit->blockSignals(true);
         lineEdit->clear();
         lineEdit->blockSignals(false);
+        lineEdit->setClearButtonEnabled(false);
+        lineEdit->setClearButtonEnabled(true);
         valueStack->setCurrentWidget(lineEdit);
     }
 }
@@ -225,6 +227,8 @@ bool TextRuleWidgetHandler::setRule(QStackedWidget *functionStack,
         lineEdit->blockSignals(true);
         lineEdit->setText(rule->contents());
         lineEdit->blockSignals(false);
+        lineEdit->setClearButtonEnabled(false);
+        lineEdit->setClearButtonEnabled(true);
         valueStack->setCurrentWidget(lineEdit);
     }
     return true;