feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix master build

Browse Source 
Amend a78720060e

Change-Id: I179fac4a604a6e582fd289ac972068b74ef4288f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Artem Sokolovskii
2023-06-06 10:21:49 +02:00
parent 29811f81dc
commit 80665d6acf
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/help/webenginehelpviewer.cpp
View File

@@ -219,7 +219,7 @@ void WebEngineHelpViewer::addForwardHistoryItems(QMenu *forwardMenu)
} }
} }
bool WebEngineHelpViewer::findText(const QString &text, Core::FindFlags flags, bool incremental, bool WebEngineHelpViewer::findText(const QString &text, Utils::FindFlags flags, bool incremental,
bool fromSearch, bool *wrapped) bool fromSearch, bool *wrapped)
{ {
Q_UNUSED(incremental) Q_UNUSED(incremental)
@@ -227,9 +227,9 @@ bool WebEngineHelpViewer::findText(const QString &text, Core::FindFlags flags, b
if (wrapped) if (wrapped)
*wrapped = false; // missing feature in QWebEngine *wrapped = false; // missing feature in QWebEngine
QWebEnginePage::FindFlags webEngineFlags; QWebEnginePage::FindFlags webEngineFlags;
if (flags & Core::FindBackward) if (flags & Utils::FindBackward)
webEngineFlags |= QWebEnginePage::FindBackward; webEngineFlags |= QWebEnginePage::FindBackward;
if (flags & Core::FindCaseSensitively) if (flags & Utils::FindCaseSensitively)
webEngineFlags |= QWebEnginePage::FindCaseSensitively; webEngineFlags |= QWebEnginePage::FindCaseSensitively;
// QWebEngineView's findText is asynchronous, and the variant taking a callback runs the // QWebEngineView's findText is asynchronous, and the variant taking a callback runs the
// callback on the main thread, so blocking here becomes ugly too // callback on the main thread, so blocking here becomes ugly too

2
src/plugins/help/webenginehelpviewer.h
View File

@@ -71,7 +71,7 @@ public:
bool isBackwardAvailable() const override; bool isBackwardAvailable() const override;
void addBackHistoryItems(QMenu *backMenu) override; void addBackHistoryItems(QMenu *backMenu) override;
void addForwardHistoryItems(QMenu *forwardMenu) override; void addForwardHistoryItems(QMenu *forwardMenu) override;
bool findText(const QString &text, Core::FindFlags flags, bool incremental, bool fromSearch, bool *wrapped) override; bool findText(const QString &text, Utils::FindFlags flags, bool incremental, bool fromSearch, bool *wrapped) override;
WebEngineHelpPage *page() const; WebEngineHelpPage *page() const;