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

Change-Id: Id7f316c3a5d4037b67e60f4d87793f8ff3d62e45

3 files changed, 13 insertions, 2 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);
diff --git a/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc b/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc
index 7f355b2fe..fd6dc7a75 100644
--- a/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc
+++ b/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc
@@ -638,6 +638,10 @@
     required pre-built binaries
     \l {http://releases.llvm.org/download.html}{here}.
 
+    To build QDoc on Debian-based Linux distributions, it is sufficient to
+    install the \c libclang-dev package and its dependencies. For running QDoc,
+    the \c libclang package is required.
+
     \section1 Set Clang location automatically
 
     The Qt build system uses the tool \c llvm-config to discover the location
@@ -665,13 +669,18 @@
     If \c llvm-config is not in your \c PATH environment variable, or not
     installed on your system, you can still build QDoc, by manually setting the
     environment variable \c LLVM_INSTALL_DIR to point to the directory where
-    LLVM is installed. This directory should be the top level directory. For
-    example, on a Linux or macOS system with LLVM installed to \c /usr/llvm:
+    the Clang libraries are installed. This directory should be the top level
+    directory. For example, on a Linux or macOS system with LLVM installed to
+    \c /usr/llvm:
 
     \badcode
         $ export LLVM_INSTALL_DIR=/usr/llvm
     \endcode
 
+    Debian-based Linux distributions usually offer multiple versions of the
+    \c libclang packages, such as \c libclang-<VERSION>. In this case,
+    \c LLVM_INSTALL_DIR should contain \c /usr/lib/clang/<VERSION> .
+
     On a Windows system with LLVM installed to \c {C:\Program Files\LLVM}:
 
     \badcode