From ecb442dc3b90cf2d523fcf8e2dacf438fdeed6f6 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Mon, 7 Oct 2019 12:04:00 +0200 Subject: Doc: Minor corrections qdoc manual Task-number: QTBUG-78936 Change-Id: I9219581857e83daaae35a717a4d9cdf8f3c4a6aa Reviewed-by: Paul Wicking --- src/qdoc/doc/qdoc-manual-contextcmds.qdoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qdoc/doc/qdoc-manual-contextcmds.qdoc b/src/qdoc/doc/qdoc-manual-contextcmds.qdoc index 61e29669c..92918ac51 100644 --- a/src/qdoc/doc/qdoc-manual-contextcmds.qdoc +++ b/src/qdoc/doc/qdoc-manual-contextcmds.qdoc @@ -241,15 +241,15 @@ \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) */ -- cgit v1.2.3 From 01ce781737c7dba94bc46b0323a7ae3c42361114 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 9 Oct 2019 09:54:06 +0200 Subject: Fix build with -no-feature-tooltip Task-number: QTBUG-79048 Change-Id: Ie6493f923089b95ca7617a9485b466b55a6f0b73 Reviewed-by: Oliver Wolff --- src/assistant/help/qhelpsearchquerywidget.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3 From b129959069d1029f011e1c9797651add9052413e Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Wed, 9 Oct 2019 14:55:19 +0200 Subject: Fix code snippet in qdoc manual Change-Id: Id62ceaac5a34b165026ee81fa504dedaa0ecb1bd Reviewed-by: Martin Smith --- src/qdoc/doc/qdoc-manual-contextcmds.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qdoc/doc/qdoc-manual-contextcmds.qdoc b/src/qdoc/doc/qdoc-manual-contextcmds.qdoc index 92918ac51..2c42493e8 100644 --- a/src/qdoc/doc/qdoc-manual-contextcmds.qdoc +++ b/src/qdoc/doc/qdoc-manual-contextcmds.qdoc @@ -250,9 +250,9 @@ dontdocument.qdoc for widgets: \badcode - /*! + / *! \dontdocument (QTypeInfo QMetaTypeId) - */ + * / \endcode \target obsolete-command -- cgit v1.2.3