diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-08 11:04:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-08 12:55:06 +0200 |
| commit | 22556f899ffd91650c1a1d5a8d71016358291859 (patch) | |
| tree | 320dfdcd26a3cd078738da5a0ab9b8ea373fde29 /src/webengine/api/qquickwebenginenewviewrequest.cpp | |
| parent | b715310a4fdc2a5e215c99bae042cd820e9a1e27 (diff) | |
| parent | dc16cdd60449112343d43852960142db7fd155fd (diff) | |
Merge branch '5.5' into 5.6
Change-Id: Idafba4d47393638cfc72fd02be092b67bb8cbd8c
Diffstat (limited to 'src/webengine/api/qquickwebenginenewviewrequest.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebenginenewviewrequest.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/webengine/api/qquickwebenginenewviewrequest.cpp b/src/webengine/api/qquickwebenginenewviewrequest.cpp index dd197dfe4..893df7f46 100644 --- a/src/webengine/api/qquickwebenginenewviewrequest.cpp +++ b/src/webengine/api/qquickwebenginenewviewrequest.cpp @@ -45,9 +45,9 @@ \inqmlmodule QtWebEngine 1.1 \since QtWebEngine 1.1 - \brief A utility class for the WebEngineView::newViewRequested signal. + \brief A utility type for the WebEngineView::newViewRequested signal. - This class contains information about the request of a page to open a new window. + Contains information about a request to load a page in a separate web engine view. \sa WebEngineView::newViewRequested */ @@ -61,7 +61,7 @@ QQuickWebEngineNewViewRequest::~QQuickWebEngineNewViewRequest() /*! \qmlproperty WebEngineView::NewViewDestination WebEngineNewViewRequest::destination - \brief The type of view that is requested by the page. + The type of the view that is requested by the page. */ QQuickWebEngineView::NewViewDestination QQuickWebEngineNewViewRequest::destination() const { @@ -70,9 +70,9 @@ QQuickWebEngineView::NewViewDestination QQuickWebEngineNewViewRequest::destinati /*! \qmlproperty bool WebEngineNewViewRequest::isUserInitiated - \brief Whether this window request was directly triggered as the result of a keyboard or mouse event. + Whether this window request was directly triggered as the result of a keyboard or mouse event. - Use this property to block possibly unwanted "popups". + Use this property to block possibly unwanted \e popups. */ bool QQuickWebEngineNewViewRequest::isUserInitiated() const { @@ -82,9 +82,8 @@ bool QQuickWebEngineNewViewRequest::isUserInitiated() const /*! \qmlmethod WebEngineNewViewRequest::openIn(WebEngineView view) - Call this method to fulfill the request and determine which WebEngineView - should be used to contain the new page. Any state, history or loaded page - within \a view will be lost as result of this. + Opens the requested page in the new web engine view \a view. State and history of the + view and the page possibly loaded in it will be lost. \sa WebEngineView::newViewRequested */ |