summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2019-10-01 08:17:50 +0200
committerPeter Varga <pvarga@inf.u-szeged.hu>2019-10-19 18:00:33 +0000
commit43f26916a5716ddcd2270c513f15a62b183929bb (patch)
tree1c2566d93e39f9e61dafbc8ca7771c501416cf6f /examples
parent0ce522cb43813a2a557c4197e0bc672596080a10 (diff)
Improve QWebEngineFindTextResult APIv5.14.0-beta2
Implements suggestions from 5.14 API review: - Rename activeMatchOrdinal to activeMatch - Extend documentation - Change QML import version number to 1.10 Task-number: QTBUG-77839 Change-Id: I5eae659cfb5355af8d0c878d3b5f00654c9d6d13 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/webengine/quicknanobrowser/BrowserWindow.qml4
-rw-r--r--examples/webengine/quicknanobrowser/FindBar.qml6
-rw-r--r--examples/webenginewidgets/simplebrowser/browserwindow.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/webengine/quicknanobrowser/BrowserWindow.qml b/examples/webengine/quicknanobrowser/BrowserWindow.qml
index 39a13df59..2d3168382 100644
--- a/examples/webengine/quicknanobrowser/BrowserWindow.qml
+++ b/examples/webengine/quicknanobrowser/BrowserWindow.qml
@@ -57,7 +57,7 @@ import QtQuick.Controls.Styles 1.0
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.0
import QtQuick.Window 2.1
-import QtWebEngine 1.11
+import QtWebEngine 1.10
ApplicationWindow {
id: browserWindow
@@ -580,7 +580,7 @@ ApplicationWindow {
findBar.visible = true;
findBar.numberOfMatches = result.numberOfMatches;
- findBar.activeMatchOrdinal = result.activeMatchOrdinal;
+ findBar.activeMatch = result.activeMatch;
}
onLoadingChanged: function(loadRequest) {
diff --git a/examples/webengine/quicknanobrowser/FindBar.qml b/examples/webengine/quicknanobrowser/FindBar.qml
index 2d673592a..de407ac33 100644
--- a/examples/webengine/quicknanobrowser/FindBar.qml
+++ b/examples/webengine/quicknanobrowser/FindBar.qml
@@ -57,12 +57,12 @@ Rectangle {
id: root
property int numberOfMatches: 0
- property int activeMatchOrdinal: 0
+ property int activeMatch: 0
property alias text: findTextField.text
function reset() {
numberOfMatches = 0;
- activeMatchOrdinal = 0;
+ activeMatch = 0;
visible = false;
}
@@ -113,7 +113,7 @@ Rectangle {
}
Label {
- text: activeMatchOrdinal + "/" + numberOfMatches
+ text: activeMatch + "/" + numberOfMatches
visible: findTextField.text != ""
}
diff --git a/examples/webenginewidgets/simplebrowser/browserwindow.cpp b/examples/webenginewidgets/simplebrowser/browserwindow.cpp
index 7b167ded7..c1d0ea359 100644
--- a/examples/webenginewidgets/simplebrowser/browserwindow.cpp
+++ b/examples/webenginewidgets/simplebrowser/browserwindow.cpp
@@ -532,7 +532,7 @@ void BrowserWindow::handleFindTextFinished(const QWebEngineFindTextResult &resul
statusBar()->showMessage(tr("\"%1\" not found.").arg(m_lastSearch));
} else {
statusBar()->showMessage(tr("\"%1\" found: %2/%3").arg(m_lastSearch,
- QString::number(result.activeMatchOrdinal()),
+ QString::number(result.activeMatch()),
QString::number(result.numberOfMatches())));
}
}