From f135b53640f6e74686d3fc8bc6ce8ffc427c36c1 Mon Sep 17 00:00:00 2001 From: Szabolcs David Date: Thu, 10 Apr 2014 05:01:51 -0700 Subject: Add linkHovered signal to the QQuickWebEngineView I dropped hovered title support from the QtWebKit API, it seems we don't need that logic. Change-Id: I5617c295344512a35aa526a6f1307f0b21f866d6 Reviewed-by: Andras Becsi --- tests/auto/quick/publicapi/tst_publicapi.cpp | 2 +- tests/auto/quick/qmltests/data/tst_linkHovered.qml | 127 +++++++++++++++++++++ tests/auto/quick/qmltests/qmltests.pro | 1 + 3 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 tests/auto/quick/qmltests/data/tst_linkHovered.qml (limited to 'tests') diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index 3ce31477b..507493e35 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -97,7 +97,7 @@ static QStringList expectedAPI = QStringList() << "QQuickWebEngineView.javaScriptConsoleMessage(int,QString,int,QString) --> void" << "QQuickWebEngineView.urlChanged() --> void" << "QQuickWebEngineView.iconChanged() --> void" - << "QQuickWebEngineView.linkHovered(QUrl,QString) --> void" + << "QQuickWebEngineView.linkHovered(QUrl) --> void" << "QQuickWebEngineView.navigationRequested(QQuickWebEngineNavigationRequest*) --> void" << "QQuickWebEngineView.loadHtml(QString,QUrl,QUrl) --> void" << "QQuickWebEngineView.loadHtml(QString,QUrl) --> void" diff --git a/tests/auto/quick/qmltests/data/tst_linkHovered.qml b/tests/auto/quick/qmltests/data/tst_linkHovered.qml new file mode 100644 index 000000000..3ce5ba923 --- /dev/null +++ b/tests/auto/quick/qmltests/data/tst_linkHovered.qml @@ -0,0 +1,127 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtWebEngine 1.0 + +TestWebEngineView { + id: webEngineView + width: 200 + height: 400 + focus: true + + property string lastUrl + + SignalSpy { + id: spy + target: webEngineView + signalName: "linkHovered" + } + + onLinkHovered: { + webEngineView.lastUrl = hoveredUrl + } + + TestCase { + name: "DesktopWebEngineViewLinkHovered" + + // Delayed windowShown to workaround problems with Qt5 in debug mode. + when: false + Timer { + running: parent.windowShown + repeat: false + interval: 1 + onTriggered: parent.when = true + } + + function init() { + webEngineView.lastUrl = "" + spy.clear() + } + + function test_linkHovered() { + compare(spy.count, 0) + mouseMove(webEngineView, 100, 300) + webEngineView.url = Qt.resolvedUrl("test2.html") + verify(webEngineView.waitForLoadSucceeded()) + + // We get a linkHovered signal with empty hoveredUrl after page load + spy.wait() + compare(spy.count, 1) + compare(webEngineView.lastUrl, "") + + mouseMove(webEngineView, 100, 100) + spy.wait() + compare(spy.count, 2) + compare(webEngineView.lastUrl, Qt.resolvedUrl("test1.html")) + mouseMove(webEngineView, 100, 300) + spy.wait() + compare(spy.count, 3) + compare(webEngineView.lastUrl, "") + } + + function test_linkHoveredDoesntEmitRepeated() { + compare(spy.count, 0) + webEngineView.url = Qt.resolvedUrl("test2.html") + verify(webEngineView.waitForLoadSucceeded()) + + // We get a linkHovered signal with empty hoveredUrl after page load + spy.wait() + compare(spy.count, 1) + compare(webEngineView.lastUrl, "") + + for (var i = 0; i < 100; i += 10) + mouseMove(webEngineView, 100, 100 + i) + + spy.wait() + compare(spy.count, 2) + compare(webEngineView.lastUrl, Qt.resolvedUrl("test1.html")) + + for (var i = 0; i < 100; i += 10) + mouseMove(webEngineView, 100, 300 + i) + + spy.wait() + compare(spy.count, 3) + compare(webEngineView.lastUrl, "") + } + } +} diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index 380abd709..23a2cbc5f 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -17,6 +17,7 @@ OTHER_FILES += \ $$PWD/data/test1.html \ $$PWD/data/test3.html \ $$PWD/data/tst_favIconLoad.qml \ + $$PWD/data/tst_linkHovered.qml \ $$PWD/data/tst_loadFail.qml \ $$PWD/data/tst_loadHtml.qml \ $$PWD/data/tst_loadProgress.qml \ -- cgit v1.2.3