diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-12 10:00:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 20:19:28 +0200 |
| commit | 2f71cdff2cda7903fd0b5ff0033d790877e40181 (patch) | |
| tree | 0255e40f5366123bedefcbc9ad7d482f2e8198a2 /src/core/api/qwebengineurlrequestinfo.cpp | |
| parent | d91b839d67bcfa1cfeb3d095b6885c97c53b9812 (diff) | |
| parent | 5b0bbd7345b698faab0116b821802fb4a30c0fa4 (diff) | |
| download | qtwebengine-wip/qt6.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.14' into wip/qt6"wip/qt6
Diffstat (limited to 'src/core/api/qwebengineurlrequestinfo.cpp')
| -rw-r--r-- | src/core/api/qwebengineurlrequestinfo.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/api/qwebengineurlrequestinfo.cpp b/src/core/api/qwebengineurlrequestinfo.cpp index e2101fd02..2aa43a318 100644 --- a/src/core/api/qwebengineurlrequestinfo.cpp +++ b/src/core/api/qwebengineurlrequestinfo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtWebEngine module of the Qt Toolkit. @@ -185,7 +185,9 @@ QWebEngineUrlRequestInfo::QWebEngineUrlRequestInfo(QWebEngineUrlRequestInfoPriva \value ResourceTypeCspReport A report of Content Security Policy (CSP) violations. CSP reports are in JSON format and they are delivered by HTTP POST requests to specified servers. (Added in Qt 5.7) - \value ResourceTypePluginResource A resource requested by a plugin. (Added in Qt 5.7) + \value ResourceTypePluginResource A resource requested by a plugin. (Added in Qt 5.7) + \value ResourceTypeNavigationPreload A service worker navigation preload + request. (Added in Qt 5.14) \value ResourceTypeUnknown Unknown request type. \note For forward compatibility all values not matched should be treated as unknown, @@ -248,8 +250,10 @@ QUrl QWebEngineUrlRequestInfo::firstPartyUrl() const } /*! - Returns the origin url of the document which initiated - the navigation when a frame navigates another frame. + Returns the origin URL of the document that initiated + the navigation of a frame to another frame. + + \since 5.14 */ QUrl QWebEngineUrlRequestInfo::initiator() const |