diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-25 09:47:18 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-25 09:47:18 +0100 |
| commit | cda76002257d56ffedbf8d28211cfd66a7226e73 (patch) | |
| tree | 03e8a7fcdfa389771d6ade5afbe5d2536328eef2 /src/webengine/doc/src/webengineview_lgpl.qdoc | |
| parent | b97f0eb87b6e6a6726b805c9de2159c6ad983f7d (diff) | |
| parent | 631f1dd72027207cf6c49a380671c58f096a37a5 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/core/api/qtbug-60565.cpp
Change-Id: Iaad05aa248fb57a69033013161e10e3acddd48f6
Diffstat (limited to 'src/webengine/doc/src/webengineview_lgpl.qdoc')
| -rw-r--r-- | src/webengine/doc/src/webengineview_lgpl.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webengine/doc/src/webengineview_lgpl.qdoc b/src/webengine/doc/src/webengineview_lgpl.qdoc index 3a7717bd2..df956f03e 100644 --- a/src/webengine/doc/src/webengineview_lgpl.qdoc +++ b/src/webengine/doc/src/webengineview_lgpl.qdoc @@ -1599,7 +1599,7 @@ */ /*! - \qmlproperty int FindTextResult::activeMatchOrdinal + \qmlproperty int FindTextResult::activeMatch \readonly \brief The index of the currently highlighted match. @@ -1607,7 +1607,7 @@ /*! \qmlsignal WebEngineView::findTextFinished(FindTextResult result) - \since QtWebEngine 1.11 + \since QtWebEngine 1.10 This signal is emitted when a string search on a page is completed. \a result is the result of the string search. |