diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2018-03-01 10:29:38 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-08 11:19:38 +0000 |
| commit | b42bd455b2b91db4f828b14729525d97b425ab6a (patch) | |
| tree | c40635f56ded188852998734220360c13ca178b9 | |
| parent | c6505f14bce8b12ddd1df6f85ea185d0111eb7f3 (diff) | |
Doc: Fix doc generation for QWebEngineView::findText()
Removed the Q_QDOC define for the FunctorOrLambda and removed the
documentation for it. Modified the signature in the \fn command for
the remaining docs.
Task-number: QTBUG-66398
Change-Id: I142df88fa599f1f31f50da50377267d1eea322d4
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | src/webenginewidgets/api/qwebengineview.h | 6 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc | 11 |
2 files changed, 1 insertions, 16 deletions
diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h index 795e011ad..6abbc1342 100644 --- a/src/webenginewidgets/api/qwebengineview.h +++ b/src/webenginewidgets/api/qwebengineview.h @@ -95,13 +95,7 @@ public: qreal zoomFactor() const; void setZoomFactor(qreal factor); - -#ifdef Q_QDOC - void findText(const QString &subString, QWebEnginePage::FindFlags options = QWebEnginePage::FindFlags()); - void findText(const QString &subString, QWebEnginePage::FindFlags options, FunctorOrLambda resultCallback); -#else void findText(const QString &subString, QWebEnginePage::FindFlags options = QWebEnginePage::FindFlags(), const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>()); -#endif QSize sizeHint() const override; QWebEngineSettings *settings() const; diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc index 18d139c00..09346a446 100644 --- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc @@ -244,16 +244,7 @@ */ /*! - \fn void QWebEngineView::findText(const QString &subString, QWebEnginePage::FindFlags options) - Finds the specified string, \a subString, in the page, using the given \a options. - - To clear the selection, just pass an empty string. - - \sa selectedText(), selectionChanged() -*/ - -/*! - \fn void QWebEngineView::findText(const QString &subString, QWebEnginePage::FindFlags options, FunctorOrLambda resultCallback) + \fn void QWebEngineView::findText(const QString &subString, QWebEnginePage::FindFlags options = QWebEnginePage::FindFlags(), const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>()) Finds the specified string, \a subString, in the page, using the given \a options. To clear the selection, just pass an empty string. |