diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-16 12:26:49 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-16 12:27:24 +0100 |
| commit | 7a85314056409b79c0db44f9bb7a2258a6ed557f (patch) | |
| tree | 53a2c734a3bdaaf3b4f303c10f09624661f6dd78 /src/webengine/api/qquickwebenginedialogrequests.cpp | |
| parent | ceff67e0bab4d34c5b791d1f1b1d43c7a4e44d84 (diff) | |
| parent | d740d6a7dbfec387752c7bc8a8b06db0e757c9dc (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: I6b16bee2d0034865270fb26a5ad93da05b9129fa
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. |