diff options
Diffstat (limited to 'src/core/api/qwebenginenewwindowrequest.cpp')
-rw-r--r-- | src/core/api/qwebenginenewwindowrequest.cpp | 72 |
1 files changed, 19 insertions, 53 deletions
diff --git a/src/core/api/qwebenginenewwindowrequest.cpp b/src/core/api/qwebenginenewwindowrequest.cpp index 1322bb4dd..895033fd1 100644 --- a/src/core/api/qwebenginenewwindowrequest.cpp +++ b/src/core/api/qwebenginenewwindowrequest.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 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$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qwebenginenewwindowrequest.h" #include "qwebenginenewwindowrequest_p.h" @@ -59,16 +23,16 @@ QT_BEGIN_NAMESPACE */ /*! - \qmltype WebEngineNewViewRequest - \instantiates QQuickWebEngineNewViewRequest - \inqmlmodule QtWebEngineQuick - \since QtWebEngine 1.1 + \qmltype WebEngineNewWindowRequest + \instantiates QWebEngineNewWindowRequest + \inqmlmodule QtWebEngine + \since QtWebEngine 1.12 - \brief A utility type for the WebEngineView::newViewRequested signal. + \brief A utility type for the WebEngineView::newWindowRequested signal. Contains information about a request to load a page in a separate web engine view. - \sa WebEngineView::newViewRequested + \sa WebEngineView::newWindowRequested */ /*! @@ -87,17 +51,17 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty enumeration WebEngineNewViewRequest::DestinationType + \qmlproperty enumeration WebEngineNewWindowRequest::DestinationType Describes how to open a new view: - \value WebEngineNewViewRequest.InNewWindow + \value WebEngineNewWindowRequest.InNewWindow In a separate window. - \value WebEngineNewViewRequest.InNewTab + \value WebEngineNewWindowRequest.InNewTab In a tab of the same window. - \value WebEngineNewViewRequest.InNewDialog + \value WebEngineNewWindowRequest.InNewDialog In a window without a tab bar, toolbar, or URL bar. - \value WebEngineNewViewRequest.InNewBackgroundTab + \value WebEngineNewWindowRequest.InNewBackgroundTab In a tab of the same window, without hiding the currently visible web engine view. */ @@ -121,7 +85,7 @@ QWebEngineNewWindowRequest::~QWebEngineNewWindowRequest() \brief The type of window that is requested. */ /*! - \qmlproperty WebEngineNewViewRequest::DestinationType WebEngineNewViewRequest::destination + \qmlproperty WebEngineNewWindowRequest::DestinationType WebEngineNewWindowRequest::destination \brief The type of window that is requested. */ QWebEngineNewWindowRequest::DestinationType QWebEngineNewWindowRequest::destination() const @@ -134,7 +98,7 @@ QWebEngineNewWindowRequest::DestinationType QWebEngineNewWindowRequest::destinat \brief The URL that is requested for the new page. */ /*! - \qmlproperty QUrl WebEngineNewViewRequest::requestedUrl + \qmlproperty QUrl WebEngineNewWindowRequest::requestedUrl \brief The URL that is requested for the new page. \since QtWebEngine 1.5 */ @@ -148,7 +112,7 @@ QUrl QWebEngineNewWindowRequest::requestedUrl() const \brief The size that is requested for the new page. */ /*! - \qmlproperty QRect WebEngineNewViewRequest::requestedGeometry + \qmlproperty QRect WebEngineNewWindowRequest::requestedGeometry \brief The size that is requested for the new page. \since QtWebEngine 2.0 */ @@ -164,7 +128,7 @@ QRect QWebEngineNewWindowRequest::requestedGeometry() const You can use this property to block automatic \e popups. */ /*! - \qmlproperty bool WebEngineNewViewRequest::userInitiated + \qmlproperty bool WebEngineNewWindowRequest::userInitiated Whether this window request was directly triggered as the result of a keyboard or mouse event. You can use this property to block automatic \e popups. @@ -189,3 +153,5 @@ void QWebEngineNewWindowRequest::openIn(QWebEnginePage *page) } QT_END_NAMESPACE + +#include "moc_qwebenginenewwindowrequest.cpp" |