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

Change-Id: Ie3479c5a11d47037aec18fca65779fc5b7356e82

src/assistant/help/qhelpsearchquerywidget.cpp

@@ -111,9 +111,11 @@ private:
     void retranslate()
     {
         m_searchLabel->setText(QHelpSearchQueryWidget::tr("Search for:"));
+        m_searchButton->setText(QHelpSearchQueryWidget::tr("Search"));
+#if QT_CONFIG(tooltip)
         m_prevQueryButton->setToolTip(QHelpSearchQueryWidget::tr("Previous search"));
         m_nextQueryButton->setToolTip(QHelpSearchQueryWidget::tr("Next search"));
-        m_searchButton->setText(QHelpSearchQueryWidget::tr("Search"));
+#endif
     }
 
     void saveQuery(const QString &query)

src/qdoc/doc/qdoc-manual-contextcmds.qdoc

@@ -241,18 +241,18 @@
     \section1 \\dontdocument
 
     The \\dontdocument command is only used in a dontdocument.qdoc file
-    for a particular module.  This file specifies publically declared
-    classes or structs that are not meant to be documented. Then QDoc will
-    not print warnings about missing \class comments for these classes
+    for a particular module. This file specifies publically declared
+    classes or structs that are not meant to be documented. QDoc will
+    not print warnings about missing \\class comments for these classes
     and structs.
 
     Below you will find the \\dontdocument command in the
     dontdocument.qdoc for widgets:
 
-    \code
-    /*!
+    \badcode
+    / *!
        \dontdocument (QTypeInfo QMetaTypeId)
-    */
+    * /
     \endcode
 
     \target obsolete-command