diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:01:40 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:01:40 +0200 |
| commit | 828c546fb2a687e4caa0f258c5655f1f0b356cd4 (patch) | |
| tree | d5ed2758b3d806c8687e73bebc4986cc5eafd4a4 /src/assistant | |
| parent | 8ed4ee82552ec61f657b2b681002c5d7813e6e76 (diff) | |
| parent | a3908f4a4fe099bfb99d5731b89068765aa2cbe5 (diff) | |
| download | qttools-828c546fb2a687e4caa0f258c5655f1f0b356cd4.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I7079bc44b6f465bd340c7d2bde37f23b65b8ee2a
Diffstat (limited to 'src/assistant')
| -rw-r--r-- | src/assistant/help/qhelpsearchquerywidget.cpp | 4 |
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) |