diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-10-11 09:54:31 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-10-11 09:54:31 +0200 |
| commit | 309f1c531366b5199cdd54149e08e10ac1d423b9 (patch) | |
| tree | f2437b4434e7d99fbfb4c068f0b1cdd7445ba702 | |
| parent | 6da2067cac4031d9df7ed72c24e29748f5351174 (diff) | |
| parent | b129959069d1029f011e1c9797651add9052413e (diff) | |
| download | qttools-309f1c531366b5199cdd54149e08e10ac1d423b9.tar.gz | |
Merge 5.13 into 5.13.2
Change-Id: I5355c7537c1f4dc5bbf80e52e3c0c28282fd4446
| -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 |