diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-10 12:48:48 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-10 12:48:48 +0200 |
| commit | a3908f4a4fe099bfb99d5731b89068765aa2cbe5 (patch) | |
| tree | 95b7b86d5e9bb6014e4d2fbc5038fcdefa506f14 | |
| parent | 751e87f0c20a2b45b8e5928902813b19867dd18b (diff) | |
| parent | b129959069d1029f011e1c9797651add9052413e (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: Ie3479c5a11d47037aec18fca65779fc5b7356e82
| -rw-r--r-- | src/assistant/help/qhelpsearchquerywidget.cpp | 4 | ||||
| -rw-r--r-- | src/qdoc/doc/qdoc-manual-contextcmds.qdoc | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/assistant/help/qhelpsearchquerywidget.cpp b/src/assistant/help/qhelpsearchquerywidget.cpp index 4cbd4b069..61902656d 100644 --- a/src/assistant/help/qhelpsearchquerywidget.cpp +++ b/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) diff --git a/src/qdoc/doc/qdoc-manual-contextcmds.qdoc b/src/qdoc/doc/qdoc-manual-contextcmds.qdoc index 61e29669c..2c42493e8 100644 --- a/src/qdoc/doc/qdoc-manual-contextcmds.qdoc +++ b/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 |