diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-04 03:03:22 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-04 03:03:23 +0200 |
| commit | 0f92411b53d653b0285f7c8919b2a682808167e5 (patch) | |
| tree | d4a9b63e68eb41597b70b233b72c37617a3da072 | |
| parent | 1c9613fcad7eea0e0ba6a537ecb6c2d6205dbb8c (diff) | |
| parent | 6c1ca200d52d671b1f33125d99d6e0cd6d469634 (diff) | |
| download | qttools-0f92411b53d653b0285f7c8919b2a682808167e5.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I1b28c85a9fea6b0e19351a5e70fdd1eb061919f6
| -rw-r--r-- | src/assistant/assistant/centralwidget.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/assistant/assistant/centralwidget.cpp b/src/assistant/assistant/centralwidget.cpp index eeb1e9e17..34304f737 100644 --- a/src/assistant/assistant/centralwidget.cpp +++ b/src/assistant/assistant/centralwidget.cpp @@ -541,8 +541,11 @@ void CentralWidget::highlightSearchTerms() TRACE_OBJ QHelpSearchEngine *searchEngine = HelpEngineWrapper::instance().searchEngine(); - const QStringList &words = searchEngine->searchInput().split(QRegExp("\\W+"), QString::SkipEmptyParts); - + const QString searchInput = searchEngine->searchInput(); + const bool wholePhrase = searchInput.startsWith(QLatin1Char('"')) && + searchInput.endsWith(QLatin1Char('"')); + const QStringList &words = wholePhrase ? QStringList(searchInput.mid(1, searchInput.length() - 2)) : + searchInput.split(QRegExp("\\W+"), QString::SkipEmptyParts); HelpViewer *viewer = currentHelpViewer(); for (const QString &word : words) viewer->findText(word, nullptr, false, true); |