summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSzabolcs David <davidsz@inf.u-szeged.hu>2016-09-07 08:54:49 -0700
committerSzabolcs David <davidsz@inf.u-szeged.hu>2016-09-20 10:53:14 +0000
commit019301166c94a546142a7ce886ce9215b099d863 (patch)
treec2351ad4e5beb5aca3177dcbb5ea58f136b43fcb /tests
parent4b9599123f636b56065b87ba670a8ae586c85557 (diff)
Remove the usages of experimental API from quicktestbrowser
The QtWebEngine.experimental import is not working, it suppresses the revisioned properties of WebEngineView objects. This is the first step to get rid of the QQuickWebEngineViewExperimental API. Change-Id: I5aacf4617df998520fe70d86a1d9043d6cc850af Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/quicktestbrowser/BrowserWindow.qml5
-rw-r--r--tests/quicktestbrowser/ContextMenuExtras.qml49
-rw-r--r--tests/quicktestbrowser/DownloadView.qml1
-rw-r--r--tests/quicktestbrowser/resources.qrc1
4 files changed, 0 insertions, 56 deletions
diff --git a/tests/quicktestbrowser/BrowserWindow.qml b/tests/quicktestbrowser/BrowserWindow.qml
index 4275fd503..2d8807e8c 100644
--- a/tests/quicktestbrowser/BrowserWindow.qml
+++ b/tests/quicktestbrowser/BrowserWindow.qml
@@ -28,7 +28,6 @@
import QtQuick 2.1
import QtWebEngine 1.2
-import QtWebEngine.experimental 1.0
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
@@ -393,10 +392,6 @@ ApplicationWindow {
permBar.requestedFeature = feature;
permBar.visible = true;
}
-
- experimental {
- extraContextMenuEntriesComponent: ContextMenuExtras {}
- }
}
Rectangle {
diff --git a/tests/quicktestbrowser/ContextMenuExtras.qml b/tests/quicktestbrowser/ContextMenuExtras.qml
deleted file mode 100644
index c90c65495..000000000
--- a/tests/quicktestbrowser/ContextMenuExtras.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-import QtQuick 2.1
-import QtWebEngine.UIDelegates 1.0
-
-VisualItemModel {
- MenuItem {
- text: "An application specific entry"
- onTriggered: console.log("Application specific action triggered")
- }
- Menu {
- title: "Extras Submenu"
- MenuItem {
- text: "something"
- onTriggered: console.log("something triggered")
- }
- MenuItem {
- text: "something else"
- enabled: false
- }
- }
-}
-
diff --git a/tests/quicktestbrowser/DownloadView.qml b/tests/quicktestbrowser/DownloadView.qml
index 90d161ce3..eb945eccc 100644
--- a/tests/quicktestbrowser/DownloadView.qml
+++ b/tests/quicktestbrowser/DownloadView.qml
@@ -30,7 +30,6 @@ import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
import QtWebEngine 1.0
-import QtWebEngine.experimental 1.0
import QtQuick.Layouts 1.0
Rectangle {
diff --git a/tests/quicktestbrowser/resources.qrc b/tests/quicktestbrowser/resources.qrc
index 2dcda4d0d..b1652852b 100644
--- a/tests/quicktestbrowser/resources.qrc
+++ b/tests/quicktestbrowser/resources.qrc
@@ -3,7 +3,6 @@
<file>ApplicationRoot.qml</file>
<file>BrowserDialog.qml</file>
<file>BrowserWindow.qml</file>
- <file>ContextMenuExtras.qml</file>
<file>FeaturePermissionBar.qml</file>
<file>FullScreenNotification.qml</file>
<file>ButtonWithMenu.qml</file>