diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-04-07 14:00:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-15 17:03:28 +0200 |
| commit | 84ced937a0f9f2874e32e16c4c6ebf72b46904c9 (patch) | |
| tree | d78373210638476d0e0ee67e398dca7a1630544b /src/webenginewidgets/doc | |
| parent | fc55f57e6cbbcd0027493d0bbea8161a814aaff2 (diff) | |
Replace uses of QWebEngineFrame with a security origin URL
This changes implemented methods. The rest of the references will go
away with the public headers cleanup.
Change-Id: I82340cd7a4488c4b463489ae98cd9c16de4e7487
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'src/webenginewidgets/doc')
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 225ad5a48..a32406264 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -416,24 +416,24 @@ */ /*! - \fn void QWebEnginePage::javaScriptAlert(QWebEngineFrame *frame, const QString& msg) - This function is called whenever a JavaScript program running inside \a frame calls the alert() function with + \fn void QWebEnginePage::javaScriptAlert(const QUrl &securityOrigin, const QString& msg) + This function is called whenever a JavaScript program running in a frame affiliated with \a securityOrigin calls the alert() function with the message \a msg. The default implementation shows the message, \a msg, with QMessageBox::information. */ /*! - \fn bool QWebEnginePage::javaScriptConfirm(QWebEngineFrame *frame, const QString& msg) - This function is called whenever a JavaScript program running inside \a frame calls the confirm() function + \fn bool QWebEnginePage::javaScriptConfirm(const QUrl &securityOrigin, const QString& msg) + This function is called whenever a JavaScript program running in a frame affiliated with \a securityOrigin calls the confirm() function with the message, \a msg. Returns true if the user confirms the message; otherwise returns false. The default implementation executes the query using QMessageBox::information with QMessageBox::Ok and QMessageBox::Cancel buttons. */ /*! - \fn bool QWebEnginePage::javaScriptPrompt(QWebEngineFrame *frame, const QString& msg, const QString& defaultValue, QString* result) - This function is called whenever a JavaScript program running inside \a frame tries to prompt the user for input. + \fn bool QWebEnginePage::javaScriptPrompt(const QUrl &securityOrigin, const QString& msg, const QString& defaultValue, QString* result) + This function is called whenever a JavaScript program running in a frame affiliated with \a securityOrigin tries to prompt the user for input. The program may provide an optional message, \a msg, as well as a default value for the input in \a defaultValue. If the prompt was cancelled by the user the implementation should return false; otherwise the |