summaryrefslogtreecommitdiff
path: root/Source/WebKit/qt/Api/qwebpage.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-05-11 09:43:24 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-05-11 09:43:24 +0200
commit1b914638db989aaa98631a1c1e02c7b2d44805d8 (patch)
tree87f4fd2c7b38db320079a5de8877890d2ca3c485 /Source/WebKit/qt/Api/qwebpage.cpp
parent2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (diff)
downloadqtwebkit-1b914638db989aaa98631a1c1e02c7b2d44805d8.tar.gz
Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)
New snapshot to include QDeclarative* -> QQml* build fixes
Diffstat (limited to 'Source/WebKit/qt/Api/qwebpage.cpp')
-rw-r--r--Source/WebKit/qt/Api/qwebpage.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebKit/qt/Api/qwebpage.cpp b/Source/WebKit/qt/Api/qwebpage.cpp
index e85dfd282..2e330acff 100644
--- a/Source/WebKit/qt/Api/qwebpage.cpp
+++ b/Source/WebKit/qt/Api/qwebpage.cpp
@@ -3407,7 +3407,7 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
\inmodule QtWebKit
- \sa QWebPage::extension() QWebPage::ExtensionReturn
+ \sa QWebPage::extension(), QWebPage::ExtensionReturn
*/
@@ -3418,7 +3418,7 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
\inmodule QtWebKit
- \sa QWebPage::extension() QWebPage::ExtensionOption
+ \sa QWebPage::extension(), QWebPage::ExtensionOption
*/
/*!
@@ -3434,7 +3434,7 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
The error itself is reported by an error \a domain, the \a error code as well as \a errorString.
- \sa QWebPage::extension() QWebPage::ErrorPageExtensionReturn
+ \sa QWebPage::extension(), QWebPage::ErrorPageExtensionReturn
*/
/*!
@@ -3481,7 +3481,7 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
External objects such as stylesheets or images referenced in the HTML are located relative to
\a baseUrl.
- \sa QWebPage::extension() QWebPage::ErrorPageExtensionOption, QString::toUtf8()
+ \sa QWebPage::extension(), QWebPage::ErrorPageExtensionOption, QString::toUtf8()
*/
/*!
@@ -3524,7 +3524,7 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
The ChooseMultipleFilesExtensionOption class holds the frame originating the request
and the suggested filenames which might be provided.
- \sa QWebPage::extension() QWebPage::chooseFile(), QWebPage::ChooseMultipleFilesExtensionReturn
+ \sa QWebPage::extension(), QWebPage::chooseFile(), QWebPage::ChooseMultipleFilesExtensionReturn
*/
/*!
@@ -3553,7 +3553,7 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
The ChooseMultipleFilesExtensionReturn class holds the filenames selected by the user
when the extension is invoked.
- \sa QWebPage::extension() QWebPage::ChooseMultipleFilesExtensionOption
+ \sa QWebPage::extension(), QWebPage::ChooseMultipleFilesExtensionOption
*/
/*!