Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: Id7f316c3a5d4037b67e60f4d87793f8ff3d62e45

2 files changed, 2 insertions, 0 deletions

diff --git a/src/assistant/assistant/indexwindow.cpp b/src/assistant/assistant/indexwindow.cpp
index d49d05f5d..d8c0f8212 100644
--- a/src/assistant/assistant/indexwindow.cpp
+++ b/src/assistant/assistant/indexwindow.cpp
@@ -58,6 +58,7 @@ IndexWindow::IndexWindow(QWidget *parent)
     layout->addWidget(l);
 
     l->setBuddy(m_searchLineEdit);
+    m_searchLineEdit->setClearButtonEnabled(true);
     connect(m_searchLineEdit, &QLineEdit::textChanged,
             this, &IndexWindow::filterIndices);
     m_searchLineEdit->installEventFilter(this);
diff --git a/src/assistant/help/qhelpsearchquerywidget.cpp b/src/assistant/help/qhelpsearchquerywidget.cpp
index bb7a61cc5..4cbd4b069 100644
--- a/src/assistant/help/qhelpsearchquerywidget.cpp
+++ b/src/assistant/help/qhelpsearchquerywidget.cpp
@@ -234,6 +234,7 @@ QHelpSearchQueryWidget::QHelpSearchQueryWidget(QWidget *parent)
     QHBoxLayout* hBoxLayout = new QHBoxLayout();
     d->m_searchLabel = new QLabel(this);
     d->m_lineEdit = new QLineEdit(this);
+    d->m_lineEdit->setClearButtonEnabled(true);
     d->m_lineEdit->setCompleter(&d->m_searchCompleter);
     d->m_lineEdit->installEventFilter(d);
     d->m_prevQueryButton = new QToolButton(this);