diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-16 18:18:07 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-01-16 18:18:07 +0000 |
| commit | 8234695a88ea853a19ccbe25157f23a632433b9a (patch) | |
| tree | 8e1d54c8a3ccaa4e9a5de93bd62dec4d89a1e43d /src/webengine/api/qquickwebenginedialogrequests.cpp | |
| parent | 51d5737fa45b62ff9fc769cdb8d3a238dbe9d1cb (diff) | |
| parent | 7a85314056409b79c0db44f9bb7a2258a6ed557f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8.0' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/webengine/api/qquickwebenginedialogrequests.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebenginedialogrequests.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/webengine/api/qquickwebenginedialogrequests.cpp b/src/webengine/api/qquickwebenginedialogrequests.cpp index 641793e12..c57f4c76f 100644 --- a/src/webengine/api/qquickwebenginedialogrequests.cpp +++ b/src/webengine/api/qquickwebenginedialogrequests.cpp @@ -312,11 +312,10 @@ QString QQuickWebEngineJavaScriptDialogRequest::message() const } /*! - \qmlproperty string JavaScriptDialogRequest::defaultPrompt + \qmlproperty string JavaScriptDialogRequest::defaultText \readonly - The default text if the requested dialog box is of - the \l type PromptDialog. + The default prompt text, if the requested dialog is a prompt. */ @@ -811,7 +810,7 @@ QString QQuickWebEngineFormValidationMessageRequest::subText() const } /*! - \qmlproperty enumeration ValidationMessageRequest::type + \qmlproperty enumeration FormValidationMessageRequest::type \readonly The type of the form validation message request. |