summaryrefslogtreecommitdiffstats
path: root/src/webengine/testsupport
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2021-02-10 12:02:57 +0100
committerMichal Klocek <michal.klocek@qt.io>2021-04-13 09:32:55 +0200
commit919dd97e835f469609a0710eb91f829a6d70e88c (patch)
tree90c9044585d8f9b71776a4cbf1f4ef4a34a7076b /src/webengine/testsupport
parent29d45bf2d105b43d8cedc923869960091771d2a1 (diff)
Fix 'WebEngine' ambiguity for Qt6
'WebEngine' is a qml module, however name itself is ambiguous. Thefore now with Qt6 and with cmake port name the module as WebEngineQuick. Change-Id: I948672dd5d389a01c6a31ec871459164fd989c0f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webengine/testsupport')
-rw-r--r--src/webengine/testsupport/plugin.cpp70
-rw-r--r--src/webengine/testsupport/plugins.qmltypes73
-rw-r--r--src/webengine/testsupport/qmldir4
-rw-r--r--src/webengine/testsupport/testsupport.pro11
4 files changed, 0 insertions, 158 deletions
diff --git a/src/webengine/testsupport/plugin.cpp b/src/webengine/testsupport/plugin.cpp
deleted file mode 100644
index 828110207..000000000
--- a/src/webengine/testsupport/plugin.cpp
+++ /dev/null
@@ -1,70 +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: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 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** 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-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtQml>
-
-#include <QtWebEngine/private/qquickwebenginetestsupport_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QtWebEngineTestSupportPlugin : public QQmlExtensionPlugin
-{
- Q_OBJECT
- Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
-public:
- void registerTypes(const char *uri) override
- {
- qWarning("\nWARNING: This project is using the testsupport QML API extensions for QtWebEngine and is therefore tied to a specific QtWebEngine release.\n"
- "WARNING: The testsupport API will change from version to version, or even be removed. You have been warned!\n");
-
- Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebEngine.testsupport"));
-
- qmlRegisterType<QQuickWebEngineTestSupport>(uri, 1, 0, "WebEngineTestSupport");
- qmlRegisterUncreatableType<QQuickWebEngineErrorPage>(uri, 1, 0, "WebEngineErrorPage",
- tr("Cannot create a separate instance of WebEngineErrorPage"));
- qmlRegisterUncreatableType<QQuickWebEngineTestInputContext>(uri, 1, 0, "TestInputContext",
- tr("Cannot create a separate instance of WebEngineErrorPage"));
- qmlRegisterUncreatableType<QQuickWebEngineTestEvent>(uri, 1, 0, "WebEngineTestEvent",
- tr("Cannot create a separate instance of WebEngineTestEvent"));
- }
-};
-
-QT_END_NAMESPACE
-
-#include "plugin.moc"
diff --git a/src/webengine/testsupport/plugins.qmltypes b/src/webengine/testsupport/plugins.qmltypes
deleted file mode 100644
index d371e1af6..000000000
--- a/src/webengine/testsupport/plugins.qmltypes
+++ /dev/null
@@ -1,73 +0,0 @@
-import QtQuick.tooling 1.2
-
-// This file describes the plugin-supplied types contained in the library.
-// It is used for QML tooling purposes only.
-//
-// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtWebEngine.testsupport 1.0'
-
-Module {
- dependencies: ["QtQuick 2.0"]
- Component { name: "QPlatformInputContext"; prototype: "QObject" }
- Component {
- name: "QQuickWebEngineErrorPage"
- prototype: "QObject"
- exports: ["QtWebEngine.testsupport/WebEngineErrorPage 1.0"]
- isCreatable: false
- exportMetaObjectRevisions: [0]
- Signal {
- name: "loadingChanged"
- Parameter { name: "loadRequest"; type: "QWebEngineLoadRequest"; isPointer: true }
- }
- }
- Component {
- name: "QQuickWebEngineTestEvent"
- prototype: "QObject"
- exports: ["QtWebEngine.testsupport/WebEngineTestEvent 1.0"]
- isCreatable: false
- exportMetaObjectRevisions: [0]
- Method {
- name: "mouseMultiClick"
- type: "bool"
- Parameter { name: "item"; type: "QObject"; isPointer: true }
- Parameter { name: "x"; type: "double" }
- Parameter { name: "y"; type: "double" }
- Parameter { name: "clickCount"; type: "int" }
- }
- }
- Component {
- name: "QQuickWebEngineTestInputContext"
- prototype: "QPlatformInputContext"
- exports: ["QtWebEngine.testsupport/TestInputContext 1.0"]
- isCreatable: false
- exportMetaObjectRevisions: [0]
- Method { name: "create" }
- Method { name: "release" }
- }
- Component {
- name: "QQuickWebEngineTestSupport"
- prototype: "QObject"
- exports: ["QtWebEngine.testsupport/WebEngineTestSupport 1.0"]
- exportMetaObjectRevisions: [0]
- Property {
- name: "errorPage"
- type: "QQuickWebEngineErrorPage"
- isReadonly: true
- isPointer: true
- }
- Property {
- name: "testInputContext"
- type: "QQuickWebEngineTestInputContext"
- isReadonly: true
- isPointer: true
- }
- Property {
- name: "testEvent"
- type: "QQuickWebEngineTestEvent"
- isReadonly: true
- isPointer: true
- }
- Signal { name: "windowCloseRejected" }
- Signal { name: "loadVisuallyCommitted" }
- }
-}
diff --git a/src/webengine/testsupport/qmldir b/src/webengine/testsupport/qmldir
deleted file mode 100644
index 7fff80251..000000000
--- a/src/webengine/testsupport/qmldir
+++ /dev/null
@@ -1,4 +0,0 @@
-module QtWebEngine.testsupport
-plugin qtwebenginetestsupportplugin
-classname QtWebEngineTestSupportPlugin
-typeinfo plugins.qmltypes
diff --git a/src/webengine/testsupport/testsupport.pro b/src/webengine/testsupport/testsupport.pro
deleted file mode 100644
index a24796675..000000000
--- a/src/webengine/testsupport/testsupport.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-CXX_MODULE = qml
-TARGET = qtwebenginetestsupportplugin
-TARGETPATH = QtWebEngine/testsupport
-IMPORT_VERSION = 1.0
-
-QT += qml quick
-QT_PRIVATE += webengine-private gui-private
-
-SOURCES = plugin.cpp
-
-load(qml_plugin)