diff options
author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-10-28 12:42:08 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-10-28 14:11:37 +0000 |
commit | 9a2b228f2e3f773b9b602a0d889378b5317cb381 (patch) | |
tree | 5a8475a494dc813da85a3025f5d53573f48797a7 /src/webengine | |
parent | b76be3dfc52ee7eb508e2837c9d83c8f79a5cb26 (diff) | |
parent | e280d6794a2b9fc6b9280f2f91016e5f95570d9d (diff) |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src/webengine')
-rw-r--r-- | src/webengine/api/qquickwebenginenewviewrequest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebenginenewviewrequest.cpp b/src/webengine/api/qquickwebenginenewviewrequest.cpp index 893df7f46..6e20c0a46 100644 --- a/src/webengine/api/qquickwebenginenewviewrequest.cpp +++ b/src/webengine/api/qquickwebenginenewviewrequest.cpp @@ -69,7 +69,7 @@ QQuickWebEngineView::NewViewDestination QQuickWebEngineNewViewRequest::destinati } /*! - \qmlproperty bool WebEngineNewViewRequest::isUserInitiated + \qmlproperty bool WebEngineNewViewRequest::userInitiated Whether this window request was directly triggered as the result of a keyboard or mouse event. Use this property to block possibly unwanted \e popups. |