1 files changed, 18 insertions, 28 deletions
diff --git a/tests/auto/quick/qmltests/data/TestWebEngineView.qml b/tests/auto/quick/qmltests/data/TestWebEngineView.qml
index 68417c6c5..415985471 100644
--- a/tests/auto/quick/qmltests/data/TestWebEngineView.qml
+++ b/tests/auto/quick/qmltests/data/TestWebEngineView.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
@@ -65,7 +40,7 @@ WebEngineView {
     }
     function _waitFor(predicate, timeout) {
         if (timeout === undefined)
-            timeout = 12000;
+            timeout = 30000;
         var i = 0
         while (i < timeout && !predicate()) {
             testResult.wait(50)
@@ -113,6 +88,21 @@ WebEngineView {
         return textSelection;
     }
 
+    function getElementValue(element) {
+        var elementValue;
+        runJavaScript("document.getElementById('" + element + "').value", function(result) {
+            elementValue = result;
+        });
+        testCase.tryVerify(function() { return elementValue != undefined; });
+        return elementValue;
+    }
+
+    function compareElementValue(element, expected) {
+        testCase.tryVerify(function() { return expected == getElementValue(element); }, 5000,
+            "Value of element \"" + element + "\" is \"" + expected + "\"");
+    }
+
+
     TestResult { id: testResult }
 
     onLoadingChanged: function(load) {