summaryrefslogtreecommitdiff
path: root/src/assistant
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-10 12:48:48 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-10 12:48:48 +0200
commita3908f4a4fe099bfb99d5731b89068765aa2cbe5 (patch)
tree95b7b86d5e9bb6014e4d2fbc5038fcdefa506f14 /src/assistant
parent751e87f0c20a2b45b8e5928902813b19867dd18b (diff)
parentb129959069d1029f011e1c9797651add9052413e (diff)
downloadqttools-a3908f4a4fe099bfb99d5731b89068765aa2cbe5.tar.gz
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: Ie3479c5a11d47037aec18fca65779fc5b7356e82
Diffstat (limited to 'src/assistant')
-rw-r--r--src/assistant/help/qhelpsearchquerywidget.cpp4
1 files changed, 3 insertions, 1 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)