summaryrefslogtreecommitdiffstats
path: root/src/webengine/plugin
diff options
context:
space:
mode:
Diffstat (limited to 'src/webengine/plugin')
-rw-r--r--src/webengine/plugin/experimental/plugin.cpp28
-rw-r--r--src/webengine/plugin/plugin.cpp39
-rw-r--r--src/webengine/plugin/plugin.pro2
-rw-r--r--src/webengine/plugin/plugins.qmltypes712
-rw-r--r--src/webengine/plugin/testsupport/plugin.cpp25
5 files changed, 338 insertions, 468 deletions
diff --git a/src/webengine/plugin/experimental/plugin.cpp b/src/webengine/plugin/experimental/plugin.cpp
index f9525e656..c45bcee43 100644
--- a/src/webengine/plugin/experimental/plugin.cpp
+++ b/src/webengine/plugin/experimental/plugin.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** 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.
**
@@ -11,24 +11,27 @@
** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** 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.LGPLv3 included in the
+** 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.html.
+** 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 later 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 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
+** 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$
**
@@ -38,6 +41,7 @@
#include "qquickwebengineview_p.h"
#include "qquickwebengineview_p_p.h"
+#include "qquickwebenginecontextmenudata_p.h"
QT_BEGIN_NAMESPACE
@@ -66,6 +70,8 @@ public:
tr("Cannot create a separate instance of WebEngineViewExperimental"));
qmlRegisterUncreatableType<QQuickWebEngineViewport>(uri, 1, 0, "WebEngineViewport",
tr("Cannot create a separate instance of WebEngineViewport"));
+ qmlRegisterUncreatableType<const QQuickWebEngineContextMenuData>(uri, 1, 0, "WebEngineContextMenuData",
+ tr("Cannot create a separate instance of WebEngineContextMenuData"));
// Use the latest revision of QQuickWebEngineView when importing QtWebEngine.experimental 1.0
qmlRegisterRevision<QQuickWebEngineView, LATEST_WEBENGINEVIEW_REVISION>(uri, 1, 0);
diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp
index ca4fb2e74..4809c0708 100644
--- a/src/webengine/plugin/plugin.cpp
+++ b/src/webengine/plugin/plugin.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** 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.
**
@@ -11,24 +11,27 @@
** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** 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.LGPLv3 included in the
+** 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.html.
+** 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 later 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 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
+** 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$
**
@@ -40,6 +43,7 @@
#include "qquickwebenginecertificateerror_p.h"
#include "qquickwebenginedownloaditem_p.h"
#include "qquickwebenginehistory_p.h"
+#include "qquickwebenginefaviconprovider_p_p.h"
#include "qquickwebengineloadrequest_p.h"
#include "qquickwebenginenavigationrequest_p.h"
#include "qquickwebenginenewviewrequest_p.h"
@@ -60,6 +64,12 @@ class QtWebEnginePlugin : public QQmlExtensionPlugin
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
public:
+ virtual void initializeEngine(QQmlEngine *engine, const char *uri) Q_DECL_OVERRIDE
+ {
+ Q_UNUSED(uri);
+ engine->addImageProvider(QQuickWebEngineFaviconProvider::identifier(), new QQuickWebEngineFaviconProvider);
+ }
+
virtual void registerTypes(const char *uri) Q_DECL_OVERRIDE
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebEngine"));
@@ -70,17 +80,22 @@ public:
qmlRegisterType<QQuickWebEngineView, 1>(uri, 1, 1, "WebEngineView");
qmlRegisterType<QQuickWebEngineView, 2>(uri, 1, 2, "WebEngineView");
+ qmlRegisterType<QQuickWebEngineView, 3>(uri, 1, 3, "WebEngineView");
qmlRegisterType<QQuickWebEngineProfile>(uri, 1, 1, "WebEngineProfile");
qmlRegisterType<QQuickWebEngineProfile, 1>(uri, 1, 2, "WebEngineProfile");
+ qmlRegisterType<QQuickWebEngineProfile, 2>(uri, 1, 3, "WebEngineProfile");
qmlRegisterType<QQuickWebEngineScript>(uri, 1, 1, "WebEngineScript");
qmlRegisterUncreatableType<QQuickWebEngineCertificateError>(uri, 1, 1, "WebEngineCertificateError", tr("Cannot create separate instance of WebEngineCertificateError"));
qmlRegisterUncreatableType<QQuickWebEngineDownloadItem>(uri, 1, 1, "WebEngineDownloadItem",
tr("Cannot create a separate instance of WebEngineDownloadItem"));
qmlRegisterUncreatableType<QQuickWebEngineDownloadItem, 1>(uri, 1, 2, "WebEngineDownloadItem",
tr("Cannot create a separate instance of WebEngineDownloadItem"));
+ qmlRegisterUncreatableType<QQuickWebEngineDownloadItem, 2>(uri, 1, 3, "WebEngineDownloadItem",
+ tr("Cannot create a separate instance of WebEngineDownloadItem"));
qmlRegisterUncreatableType<QQuickWebEngineNewViewRequest>(uri, 1, 1, "WebEngineNewViewRequest", tr("Cannot create separate instance of WebEngineNewViewRequest"));
qmlRegisterUncreatableType<QQuickWebEngineSettings>(uri, 1, 1, "WebEngineSettings", tr("Cannot create a separate instance of WebEngineSettings"));
- // FIXME(QTBUG-40043): qmlRegisterUncreatableType<QQuickWebEngineSettings, 1>(uri, 1, 2, "WebEngineSettings", tr("Cannot create a separate instance of WebEngineSettings"));
+ qmlRegisterUncreatableType<QQuickWebEngineSettings, 1>(uri, 1, 2, "WebEngineSettings", tr("Cannot create a separate instance of WebEngineSettings"));
+ qmlRegisterUncreatableType<QQuickWebEngineSettings, 2>(uri, 1, 3, "WebEngineSettings", tr("Cannot create a separate instance of WebEngineSettings"));
qmlRegisterSingletonType<QQuickWebEngineSingleton>(uri, 1, 1, "WebEngine", webEngineSingletonProvider);
qmlRegisterUncreatableType<QQuickWebEngineHistory>(uri, 1, 1, "NavigationHistory",
tr("Cannot create a separate instance of NavigationHistory"));
diff --git a/src/webengine/plugin/plugin.pro b/src/webengine/plugin/plugin.pro
index b6acc760f..2fbadfc97 100644
--- a/src/webengine/plugin/plugin.pro
+++ b/src/webengine/plugin/plugin.pro
@@ -1,7 +1,7 @@
CXX_MODULE = qml
TARGET = qtwebengineplugin
TARGETPATH = QtWebEngine
-IMPORT_VERSION = 1.2
+IMPORT_VERSION = 1.3
QT += webengine qml quick
QT_PRIVATE += webengine-private
diff --git a/src/webengine/plugin/plugins.qmltypes b/src/webengine/plugin/plugins.qmltypes
index 4fce34a21..23ba77235 100644
--- a/src/webengine/plugin/plugins.qmltypes
+++ b/src/webengine/plugin/plugins.qmltypes
@@ -4,429 +4,24 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtWebEngine 1.2'
+// 'qmlplugindump -nonrelocatable -defaultplatform QtWebEngine 1.3'
Module {
- dependencies: []
- Component {
- name: "QAbstractItemModel"
- prototype: "QObject"
- Enum {
- name: "LayoutChangeHint"
- values: {
- "NoLayoutChangeHint": 0,
- "VerticalSortHint": 1,
- "HorizontalSortHint": 2
- }
- }
- Signal {
- name: "dataChanged"
- Parameter { name: "topLeft"; type: "QModelIndex" }
- Parameter { name: "bottomRight"; type: "QModelIndex" }
- Parameter { name: "roles"; type: "QVector<int>" }
- }
- Signal {
- name: "dataChanged"
- Parameter { name: "topLeft"; type: "QModelIndex" }
- Parameter { name: "bottomRight"; type: "QModelIndex" }
- }
- Signal {
- name: "headerDataChanged"
- Parameter { name: "orientation"; type: "Qt::Orientation" }
- Parameter { name: "first"; type: "int" }
- Parameter { name: "last"; type: "int" }
- }
- Signal {
- name: "layoutChanged"
- Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
- Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
- }
- Signal {
- name: "layoutChanged"
- Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
- }
- Signal { name: "layoutChanged" }
- Signal {
- name: "layoutAboutToBeChanged"
- Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
- Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
- }
- Signal {
- name: "layoutAboutToBeChanged"
- Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
- }
- Signal { name: "layoutAboutToBeChanged" }
- Signal {
- name: "rowsAboutToBeInserted"
- Parameter { name: "parent"; type: "QModelIndex" }
- Parameter { name: "first"; type: "int" }
- Parameter { name: "last"; type: "int" }
- }
- Signal {
- name: "rowsInserted"
- Parameter { name: "parent"; type: "QModelIndex" }
- Parameter { name: "first"; type: "int" }
- Parameter { name: "last"; type: "int" }
- }
- Signal {
- name: "rowsAboutToBeRemoved"
- Parameter { name: "parent"; type: "QModelIndex" }
- Parameter { name: "first"; type: "int" }
- Parameter { name: "last"; type: "int" }
- }
- Signal {
- name: "rowsRemoved"
- Parameter { name: "parent"; type: "QModelIndex" }
- Parameter { name: "first"; type: "int" }
- Parameter { name: "last"; type: "int" }
- }
- Signal {
- name: "columnsAboutToBeInserted"
- Parameter { name: "parent"; type: "QModelIndex" }
- Parameter { name: "first"; type: "int" }
- Parameter { name: "last"; type: "int" }
- }
- Signal {
- name: "columnsInserted"
- Parameter { name: "parent"; type: "QModelIndex" }
- Parameter { name: "first"; type: "int" }
- Parameter { name: "last"; type: "int" }
- }
- Signal {
- name: "columnsAboutToBeRemoved"
- Parameter { name: "parent"; type: "QModelIndex" }
- Parameter { name: "first"; type: "int" }
- Parameter { name: "last"; type: "int" }
- }
- Signal {
- name: "columnsRemoved"
- Parameter { name: "parent"; type: "QModelIndex" }
- Parameter { name: "first"; type: "int" }
- Parameter { name: "last"; type: "int" }
- }
- Signal { name: "modelAboutToBeReset" }
- Signal { name: "modelReset" }
- Signal {
- name: "rowsAboutToBeMoved"
- Parameter { name: "sourceParent"; type: "QModelIndex" }
- Parameter { name: "sourceStart"; type: "int" }
- Parameter { name: "sourceEnd"; type: "int" }
- Parameter { name: "destinationParent"; type: "QModelIndex" }
- Parameter { name: "destinationRow"; type: "int" }
- }
- Signal {
- name: "rowsMoved"
- Parameter { name: "parent"; type: "QModelIndex" }
- Parameter { name: "start"; type: "int" }
- Parameter { name: "end"; type: "int" }
- Parameter { name: "destination"; type: "QModelIndex" }
- Parameter { name: "row"; type: "int" }
- }
- Signal {
- name: "columnsAboutToBeMoved"
- Parameter { name: "sourceParent"; type: "QModelIndex" }
- Parameter { name: "sourceStart"; type: "int" }
- Parameter { name: "sourceEnd"; type: "int" }
- Parameter { name: "destinationParent"; type: "QModelIndex" }
- Parameter { name: "destinationColumn"; type: "int" }
- }
- Signal {
- name: "columnsMoved"
- Parameter { name: "parent"; type: "QModelIndex" }
- Parameter { name: "start"; type: "int" }
- Parameter { name: "end"; type: "int" }
- Parameter { name: "destination"; type: "QModelIndex" }
- Parameter { name: "column"; type: "int" }
- }
- Method { name: "submit"; type: "bool" }
- Method { name: "revert" }
- Method {
- name: "hasIndex"
- type: "bool"
- Parameter { name: "row"; type: "int" }
- Parameter { name: "column"; type: "int" }
- Parameter { name: "parent"; type: "QModelIndex" }
- }
- Method {
- name: "hasIndex"
- type: "bool"
- Parameter { name: "row"; type: "int" }
- Parameter { name: "column"; type: "int" }
- }
- Method {
- name: "index"
- type: "QModelIndex"
- Parameter { name: "row"; type: "int" }
- Parameter { name: "column"; type: "int" }
- Parameter { name: "parent"; type: "QModelIndex" }
- }
- Method {
- name: "index"
- type: "QModelIndex"
- Parameter { name: "row"; type: "int" }
- Parameter { name: "column"; type: "int" }
- }
- Method {
- name: "parent"
- type: "QModelIndex"
- Parameter { name: "child"; type: "QModelIndex" }
- }
- Method {
- name: "sibling"
- type: "QModelIndex"
- Parameter { name: "row"; type: "int" }
- Parameter { name: "column"; type: "int" }
- Parameter { name: "idx"; type: "QModelIndex" }
- }
- Method {
- name: "rowCount"
- type: "int"
- Parameter { name: "parent"; type: "QModelIndex" }
- }
- Method { name: "rowCount"; type: "int" }
- Method {
- name: "columnCount"
- type: "int"
- Parameter { name: "parent"; type: "QModelIndex" }
- }
- Method { name: "columnCount"; type: "int" }
- Method {
- name: "hasChildren"
- type: "bool"
- Parameter { name: "parent"; type: "QModelIndex" }
- }
- Method { name: "hasChildren"; type: "bool" }
- Method {
- name: "data"
- type: "QVariant"
- Parameter { name: "index"; type: "QModelIndex" }
- Parameter { name: "role"; type: "int" }
- }
- Method {
- name: "data"
- type: "QVariant"
- Parameter { name: "index"; type: "QModelIndex" }
- }
- Method {
- name: "setData"
- type: "bool"
- Parameter { name: "index"; type: "QModelIndex" }
- Parameter { name: "value"; type: "QVariant" }
- Parameter { name: "role"; type: "int" }
- }
- Method {
- name: "setData"
- type: "bool"
- Parameter { name: "index"; type: "QModelIndex" }
- Parameter { name: "value"; type: "QVariant" }
- }
- Method {
- name: "headerData"
- type: "QVariant"
- Parameter { name: "section"; type: "int" }
- Parameter { name: "orientation"; type: "Qt::Orientation" }
- Parameter { name: "role"; type: "int" }
- }
- Method {
- name: "headerData"
- type: "QVariant"
- Parameter { name: "section"; type: "int" }
- Parameter { name: "orientation"; type: "Qt::Orientation" }
- }
- Method {
- name: "fetchMore"
- Parameter { name: "parent"; type: "QModelIndex" }
- }
- Method {
- name: "canFetchMore"
- type: "bool"
- Parameter { name: "parent"; type: "QModelIndex" }
- }
- Method {
- name: "flags"
- type: "Qt::ItemFlags"
- Parameter { name: "index"; type: "QModelIndex" }
- }
- Method {
- name: "match"
- type: "QModelIndexList"
- Parameter { name: "start"; type: "QModelIndex" }
- Parameter { name: "role"; type: "int" }
- Parameter { name: "value"; type: "QVariant" }
- Parameter { name: "hits"; type: "int" }
- Parameter { name: "flags"; type: "Qt::MatchFlags" }
- }
- Method {
- name: "match"
- type: "QModelIndexList"
- Parameter { name: "start"; type: "QModelIndex" }
- Parameter { name: "role"; type: "int" }
- Parameter { name: "value"; type: "QVariant" }
- Parameter { name: "hits"; type: "int" }
- }
- Method {
- name: "match"
- type: "QModelIndexList"
- Parameter { name: "start"; type: "QModelIndex" }
- Parameter { name: "role"; type: "int" }
- Parameter { name: "value"; type: "QVariant" }
- }
- }
- Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" }
- Component {
- name: "QQuickItem"
- defaultProperty: "data"
- prototype: "QObject"
- Enum {
- name: "TransformOrigin"
- values: {
- "TopLeft": 0,
- "Top": 1,
- "TopRight": 2,
- "Left": 3,
- "Center": 4,
- "Right": 5,
- "BottomLeft": 6,
- "Bottom": 7,
- "BottomRight": 8
- }
- }
- Property { name: "parent"; type: "QQuickItem"; isPointer: true }
- Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
- Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
- Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
- Property { name: "x"; type: "double" }
- Property { name: "y"; type: "double" }
- Property { name: "z"; type: "double" }
- Property { name: "width"; type: "double" }
- Property { name: "height"; type: "double" }
- Property { name: "opacity"; type: "double" }
- Property { name: "enabled"; type: "bool" }
- Property { name: "visible"; type: "bool" }
- Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
- Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
- Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
- Property { name: "state"; type: "string" }
- Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
- Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
- Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
- Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
- Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
- Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
- Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
- Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
- Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
- Property { name: "baselineOffset"; type: "double" }
- Property { name: "clip"; type: "bool" }
- Property { name: "focus"; type: "bool" }
- Property { name: "activeFocus"; type: "bool"; isReadonly: true }
- Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
- Property { name: "rotation"; type: "double" }
- Property { name: "scale"; type: "double" }
- Property { name: "transformOrigin"; type: "TransformOrigin" }
- Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
- Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
- Property { name: "smooth"; type: "bool" }
- Property { name: "antialiasing"; type: "bool" }
- Property { name: "implicitWidth"; type: "double" }
- Property { name: "implicitHeight"; type: "double" }
- Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
- Signal {
- name: "childrenRectChanged"
- Parameter { type: "QRectF" }
- }
- Signal {
- name: "baselineOffsetChanged"
- Parameter { type: "double" }
- }
- Signal {
- name: "stateChanged"
- Parameter { type: "string" }
- }
- Signal {
- name: "focusChanged"
- Parameter { type: "bool" }
- }
- Signal {
- name: "activeFocusChanged"
- Parameter { type: "bool" }
- }
- Signal {
- name: "activeFocusOnTabChanged"
- revision: 1
- Parameter { type: "bool" }
- }
- Signal {
- name: "parentChanged"
- Parameter { type: "QQuickItem"; isPointer: true }
- }
- Signal {
- name: "transformOriginChanged"
- Parameter { type: "TransformOrigin" }
- }
- Signal {
- name: "smoothChanged"
- Parameter { type: "bool" }
- }
- Signal {
- name: "antialiasingChanged"
- Parameter { type: "bool" }
- }
- Signal {
- name: "clipChanged"
- Parameter { type: "bool" }
- }
- Signal {
- name: "windowChanged"
- revision: 1
- Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
- }
- Method { name: "update" }
- Method {
- name: "grabToImage"
- revision: 2
- type: "bool"
- Parameter { name: "callback"; type: "QJSValue" }
- Parameter { name: "targetSize"; type: "QSize" }
- }
- Method {
- name: "grabToImage"
- revision: 2
- type: "bool"
- Parameter { name: "callback"; type: "QJSValue" }
- }
- Method {
- name: "contains"
- type: "bool"
- Parameter { name: "point"; type: "QPointF" }
- }
- Method {
- name: "mapFromItem"
- Parameter { type: "QQmlV4Function"; isPointer: true }
- }
- Method {
- name: "mapToItem"
- Parameter { type: "QQmlV4Function"; isPointer: true }
- }
- Method { name: "forceActiveFocus" }
- Method {
- name: "forceActiveFocus"
- Parameter { name: "reason"; type: "Qt::FocusReason" }
- }
- Method {
- name: "nextItemInFocusChain"
- revision: 1
- type: "QQuickItem*"
- Parameter { name: "forward"; type: "bool" }
- }
- Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
- Method {
- name: "childAt"
- type: "QQuickItem*"
- Parameter { name: "x"; type: "double" }
- Parameter { name: "y"; type: "double" }
- }
- }
+ dependencies: [
+ "Qt.labs.folderlistmodel 2.1",
+ "Qt.labs.settings 1.0",
+ "QtGraphicalEffects 1.0",
+ "QtQml.Models 2.2",
+ "QtQuick 2.6",
+ "QtQuick.Controls 1.5",
+ "QtQuick.Controls.Styles 1.4",
+ "QtQuick.Dialogs 1.2",
+ "QtQuick.Extras 1.4",
+ "QtQuick.Extras.Private.CppUtils 1.1",
+ "QtQuick.Layouts 1.1",
+ "QtQuick.PrivateWidgets 1.1",
+ "QtQuick.Window 2.2"
+ ]
Component {
name: "QQuickWebEngineCertificateError"
prototype: "QObject"
@@ -462,9 +57,13 @@ Module {
Component {
name: "QQuickWebEngineDownloadItem"
prototype: "QObject"
- exports: ["QtWebEngine/WebEngineDownloadItem 1.1"]
+ exports: [
+ "QtWebEngine/WebEngineDownloadItem 1.1",
+ "QtWebEngine/WebEngineDownloadItem 1.2",
+ "QtWebEngine/WebEngineDownloadItem 1.3"
+ ]
isCreatable: false
- exportMetaObjectRevisions: [0]
+ exportMetaObjectRevisions: [0, 1, 2]
Enum {
name: "DownloadState"
values: {
@@ -475,11 +74,24 @@ Module {
"DownloadInterrupted": 4
}
}
+ Enum {
+ name: "SavePageFormat"
+ values: {
+ "UnknownSaveFormat": -1,
+ "SingleHtmlSaveFormat": 0,
+ "CompleteHtmlSaveFormat": 1,
+ "MimeHtmlSaveFormat": 2
+ }
+ }
Property { name: "id"; type: "uint"; isReadonly: true }
Property { name: "state"; type: "DownloadState"; isReadonly: true }
+ Property { name: "savePageFormat"; revision: 2; type: "SavePageFormat" }
Property { name: "totalBytes"; type: "qlonglong"; isReadonly: true }
Property { name: "receivedBytes"; type: "qlonglong"; isReadonly: true }
+ Property { name: "mimeType"; revision: 1; type: "string"; isReadonly: true }
Property { name: "path"; type: "string" }
+ Signal { name: "savePageFormatChanged"; revision: 2 }
+ Signal { name: "mimeTypeChanged"; revision: 1 }
Method { name: "accept" }
Method { name: "cancel" }
}
@@ -575,14 +187,16 @@ Module {
prototype: "QObject"
exports: [
"QtWebEngine/WebEngineProfile 1.1",
- "QtWebEngine/WebEngineProfile 1.2"
+ "QtWebEngine/WebEngineProfile 1.2",
+ "QtWebEngine/WebEngineProfile 1.3"
]
- exportMetaObjectRevisions: [0, 1]
+ exportMetaObjectRevisions: [0, 1, 2]
Enum {
name: "HttpCacheType"
values: {
"MemoryHttpCache": 0,
- "DiskHttpCache": 1
+ "DiskHttpCache": 1,
+ "NoCache": 2
}
}
Enum {
@@ -599,7 +213,7 @@ Module {
Property { name: "cachePath"; type: "string" }
Property { name: "httpUserAgent"; type: "string" }
Property { name: "httpCacheType"; type: "HttpCacheType" }
- Property { name: "httpAcceptLanguage"; type: "string" }
+ Property { name: "httpAcceptLanguage"; revision: 1; type: "string" }
Property { name: "persistentCookiesPolicy"; type: "PersistentCookiesPolicy" }
Property { name: "httpCacheMaximumSize"; type: "int" }
Signal { name: "httpAcceptLanguageChanged"; revision: 1 }
@@ -611,7 +225,7 @@ Module {
name: "downloadFinished"
Parameter { name: "download"; type: "QQuickWebEngineDownloadItem"; isPointer: true }
}
- Method { name: "cookieStore"; revision: 1; type: "QWebEngineCookieStore*" }
+ Method { name: "clearHttpCache"; revision: 2 }
}
Component {
name: "QQuickWebEngineScript"
@@ -695,10 +309,11 @@ Module {
prototype: "QObject"
exports: [
"QtWebEngine/WebEngineSettings 1.1",
- "QtWebEngine/WebEngineSettings 1.2"
+ "QtWebEngine/WebEngineSettings 1.2",
+ "QtWebEngine/WebEngineSettings 1.3"
]
isCreatable: false
- exportMetaObjectRevisions: [0, 1]
+ exportMetaObjectRevisions: [0, 1, 2]
Property { name: "autoLoadImages"; type: "bool" }
Property { name: "javascriptEnabled"; type: "bool" }
Property { name: "javascriptCanOpenWindows"; type: "bool" }
@@ -713,7 +328,17 @@ Module {
Property { name: "pluginsEnabled"; type: "bool" }
Property { name: "fullScreenSupportEnabled"; revision: 1; type: "bool" }
Property { name: "defaultTextEncoding"; type: "string" }
+ Property { name: "screenCaptureEnabled"; revision: 2; type: "bool" }
+ Property { name: "webGLEnabled"; revision: 2; type: "bool" }
+ Property { name: "accelerated2dCanvasEnabled"; revision: 2; type: "bool" }
+ Property { name: "autoLoadIconsForPage"; revision: 2; type: "bool" }
+ Property { name: "touchIconsEnabled"; revision: 2; type: "bool" }
Signal { name: "fullScreenSupportEnabledChanged"; revision: 1 }
+ Signal { name: "screenCaptureEnabledChanged"; revision: 2 }
+ Signal { name: "webGLEnabledChanged"; revision: 2 }
+ Signal { name: "accelerated2dCanvasEnabledChanged"; revision: 2 }
+ Signal { name: "autoLoadIconsForPageChanged"; revision: 2 }
+ Signal { name: "touchIconsEnabledChanged"; revision: 2 }
}
Component {
name: "QQuickWebEngineSingleton"
@@ -738,9 +363,10 @@ Module {
exports: [
"QtWebEngine/WebEngineView 1.0",
"QtWebEngine/WebEngineView 1.1",
- "QtWebEngine/WebEngineView 1.2"
+ "QtWebEngine/WebEngineView 1.2",
+ "QtWebEngine/WebEngineView 1.3"
]
- exportMetaObjectRevisions: [0, 1, 2]
+ exportMetaObjectRevisions: [0, 1, 2, 3]
Enum {
name: "NavigationRequestAction"
values: {
@@ -831,7 +457,9 @@ Module {
"InspectElement": 26,
"ExitFullScreen": 27,
"RequestClose": 28,
- "WebActionCount": 29
+ "Unselect": 29,
+ "SavePage": 30,
+ "WebActionCount": 31
}
}
Enum {
@@ -858,6 +486,145 @@ Module {
"FindCaseSensitively": 2
}
}
+ Enum {
+ name: "PrintedPageSizeId"
+ values: {
+ "A4": 0,
+ "B5": 1,
+ "Letter": 2,
+ "Legal": 3,
+ "Executive": 4,
+ "A0": 5,
+ "A1": 6,
+ "A2": 7,
+ "A3": 8,
+ "A5": 9,
+ "A6": 10,
+ "A7": 11,
+ "A8": 12,
+ "A9": 13,
+ "B0": 14,
+ "B1": 15,
+ "B10": 16,
+ "B2": 17,
+ "B3": 18,
+ "B4": 19,
+ "B6": 20,
+ "B7": 21,
+ "B8": 22,
+ "B9": 23,
+ "C5E": 24,
+ "Comm10E": 25,
+ "DLE": 26,
+ "Folio": 27,
+ "Ledger": 28,
+ "Tabloid": 29,
+ "Custom": 30,
+ "A10": 31,
+ "A3Extra": 32,
+ "A4Extra": 33,
+ "A4Plus": 34,
+ "A4Small": 35,
+ "A5Extra": 36,
+ "B5Extra": 37,
+ "JisB0": 38,
+ "JisB1": 39,
+ "JisB2": 40,
+ "JisB3": 41,
+ "JisB4": 42,
+ "JisB5": 43,
+ "JisB6": 44,
+ "JisB7": 45,
+ "JisB8": 46,
+ "JisB9": 47,
+ "JisB10": 48,
+ "AnsiC": 49,
+ "AnsiD": 50,
+ "AnsiE": 51,
+ "LegalExtra": 52,
+ "LetterExtra": 53,
+ "LetterPlus": 54,
+ "LetterSmall": 55,
+ "TabloidExtra": 56,
+ "ArchA": 57,
+ "ArchB": 58,
+ "ArchC": 59,
+ "ArchD": 60,
+ "ArchE": 61,
+ "Imperial7x9": 62,
+ "Imperial8x10": 63,
+ "Imperial9x11": 64,
+ "Imperial9x12": 65,
+ "Imperial10x11": 66,
+ "Imperial10x13": 67,
+ "Imperial10x14": 68,
+ "Imperial12x11": 69,
+ "Imperial15x11": 70,
+ "ExecutiveStandard": 71,
+ "Note": 72,
+ "Quarto": 73,
+ "Statement": 74,
+ "SuperA": 75,
+ "SuperB": 76,
+ "Postcard": 77,
+ "DoublePostcard": 78,
+ "Prc16K": 79,
+ "Prc32K": 80,
+ "Prc32KBig": 81,
+ "FanFoldUS": 82,
+ "FanFoldGerman": 83,
+ "FanFoldGermanLegal": 84,
+ "EnvelopeB4": 85,
+ "EnvelopeB5": 86,
+ "EnvelopeB6": 87,
+ "EnvelopeC0": 88,
+ "EnvelopeC1": 89,
+ "EnvelopeC2": 90,
+ "EnvelopeC3": 91,
+ "EnvelopeC4": 92,
+ "EnvelopeC6": 93,
+ "EnvelopeC65": 94,
+ "EnvelopeC7": 95,
+ "Envelope9": 96,
+ "Envelope11": 97,
+ "Envelope12": 98,
+ "Envelope14": 99,
+ "EnvelopeMonarch": 100,
+ "EnvelopePersonal": 101,
+ "EnvelopeChou3": 102,
+ "EnvelopeChou4": 103,
+ "EnvelopeInvite": 104,
+ "EnvelopeItalian": 105,
+ "EnvelopeKaku2": 106,
+ "EnvelopeKaku3": 107,
+ "EnvelopePrc1": 108,
+ "EnvelopePrc2": 109,
+ "EnvelopePrc3": 110,
+ "EnvelopePrc4": 111,
+ "EnvelopePrc5": 112,
+ "EnvelopePrc6": 113,
+ "EnvelopePrc7": 114,
+ "EnvelopePrc8": 115,
+ "EnvelopePrc9": 116,
+ "EnvelopePrc10": 117,
+ "EnvelopeYou4": 118,
+ "LastPageSize": 118,
+ "NPageSize": 118,
+ "NPaperSize": 118,
+ "AnsiA": 2,
+ "AnsiB": 28,
+ "EnvelopeC5": 24,
+ "EnvelopeDL": 26,
+ "Envelope10": 25
+ }
+ }
+ Enum {
+ name: "PrintedPageOrientation"
+ values: {
+ "Portrait": 0,
+ "Landscape": 1
+ }
+ }
Property { name: "url"; type: "QUrl" }
Property { name: "icon"; type: "QUrl"; isReadonly: true }
Property { name: "loading"; type: "bool"; isReadonly: true }
@@ -892,6 +659,11 @@ Module {
}
Property { name: "activeFocusOnPress"; revision: 2; type: "bool" }
Property { name: "backgroundColor"; revision: 2; type: "QColor" }
+ Property { name: "contentsSize"; revision: 3; type: "QSizeF"; isReadonly: true }
+ Property { name: "scrollPosition"; revision: 3; type: "QPointF"; isReadonly: true }
+ Property { name: "audioMuted"; revision: 3; type: "bool" }
+ Property { name: "recentlyAudible"; revision: 3; type: "bool"; isReadonly: true }
+ Property { name: "webChannelWorld"; revision: 3; type: "uint" }
Signal {
name: "loadingChanged"
Parameter { name: "loadRequest"; type: "QQuickWebEngineLoadRequest"; isPointer: true }
@@ -953,6 +725,31 @@ Module {
Parameter { name: "exitCode"; type: "int" }
}
Signal { name: "windowCloseRequested"; revision: 2 }
+ Signal {
+ name: "contentsSizeChanged"
+ revision: 3
+ Parameter { name: "size"; type: "QSizeF" }
+ }
+ Signal {
+ name: "scrollPositionChanged"
+ revision: 3
+ Parameter { name: "position"; type: "QPointF" }
+ }
+ Signal {
+ name: "audioMutedChanged"
+ revision: 3
+ Parameter { name: "muted"; type: "bool" }
+ }
+ Signal {
+ name: "recentlyAudibleChanged"
+ revision: 3
+ Parameter { name: "recentlyAudible"; type: "bool" }
+ }
+ Signal {
+ name: "webChannelWorldChanged"
+ revision: 3
+ Parameter { type: "uint" }
+ }
Method {
name: "runJavaScript"
Parameter { type: "string" }
@@ -963,6 +760,19 @@ Module {
Parameter { type: "string" }
}
Method {
+ name: "runJavaScript"
+ revision: 3
+ Parameter { type: "string" }
+ Parameter { name: "worldId"; type: "uint" }
+ Parameter { type: "QJSValue" }
+ }
+ Method {
+ name: "runJavaScript"
+ revision: 3
+ Parameter { type: "string" }
+ Parameter { name: "worldId"; type: "uint" }
+ }
+ Method {
name: "loadHtml"
Parameter { name: "html"; type: "string" }
Parameter { name: "baseUrl"; type: "QUrl" }
@@ -1017,5 +827,41 @@ Module {
revision: 2
Parameter { name: "action"; type: "WebAction" }
}
+ Method {
+ name: "printToPdf"
+ revision: 3
+ Parameter { name: "filePath"; type: "string" }
+ Parameter { name: "pageSizeId"; type: "PrintedPageSizeId" }
+ Parameter { name: "orientation"; type: "PrintedPageOrientation" }
+ }
+ Method {
+ name: "printToPdf"
+ revision: 3
+ Parameter { name: "filePath"; type: "string" }
+ Parameter { name: "pageSizeId"; type: "PrintedPageSizeId" }
+ }
+ Method {
+ name: "printToPdf"
+ revision: 3
+ Parameter { name: "filePath"; type: "string" }
+ }
+ Method {
+ name: "printToPdf"
+ revision: 3
+ Parameter { name: "callback"; type: "QJSValue" }
+ Parameter { name: "pageSizeId"; type: "PrintedPageSizeId" }
+ Parameter { name: "orientation"; type: "PrintedPageOrientation" }
+ }
+ Method {
+ name: "printToPdf"
+ revision: 3
+ Parameter { name: "callback"; type: "QJSValue" }
+ Parameter { name: "pageSizeId"; type: "PrintedPageSizeId" }
+ }
+ Method {
+ name: "printToPdf"
+ revision: 3
+ Parameter { name: "callback"; type: "QJSValue" }
+ }
}
}
diff --git a/src/webengine/plugin/testsupport/plugin.cpp b/src/webengine/plugin/testsupport/plugin.cpp
index 28001db54..e1252361e 100644
--- a/src/webengine/plugin/testsupport/plugin.cpp
+++ b/src/webengine/plugin/testsupport/plugin.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** 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.
**
@@ -11,24 +11,27 @@
** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** 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.LGPLv3 included in the
+** 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.html.
+** 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 later 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 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
+** 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$
**
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 20:00:00 +0000