From 43f26916a5716ddcd2270c513f15a62b183929bb Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Tue, 1 Oct 2019 08:17:50 +0200
Subject: Improve QWebEngineFindTextResult API

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>
---
 examples/webengine/quicknanobrowser/BrowserWindow.qml | 4 ++--
 examples/webengine/quicknanobrowser/FindBar.qml       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'examples/webengine')

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 != ""
         }
 
-- 
cgit v1.2.3