summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-10-26 16:35:17 (GMT)
committerJocelyn Turcotte <jocelyn.turcotte@nokia.com>2009-11-10 09:30:29 (GMT)
commit8474d7e594f5b70ca88ef0188969298ed771e875 (patch)
tree9e38db84e7cdb8147589a2a5ced9ae532a4006a2
parenta6123418522a3865d462cb64022f567462603af1 (diff)
downloadQt-8474d7e594f5b70ca88ef0188969298ed771e875.zip
Qt-8474d7e594f5b70ca88ef0188969298ed771e875.tar.gz
Qt-8474d7e594f5b70ca88ef0188969298ed771e875.tar.bz2
Re-apply change 4f62d29e8ae464c223af5bc08ae219d9b198da63 by David Boddie
Re-apply change b4be512bffba65bf4577a2b8275d7c38ce5501a1 by David Boddie Re-apply change 6f36d0aafaccbb9affe8ac1b82c225d985aa7491 by David Boddie Doc: Added internal or hidden placeholder documentation. Reviewed-by: Trust Me To-be-completed-by: QtWebKit developers
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index 8499e10..d4a491b 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -2759,6 +2759,17 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
as a result of the user clicking on a "file upload" button in a HTML form where multiple
file selection is allowed.
+ \omitvalue ErrorPageExtension (introduced in Qt 4.6)
+*/
+
+/*!
+ \enum QWebPage::ErrorDomain
+ \since 4.6
+ \internal
+
+ \value QtNetwork
+ \value Http
+ \value WebKit
*/
/*!
@@ -2809,6 +2820,12 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
*/
/*!
+ \fn QWebPage::ErrorPageExtensionReturn::ErrorPageExtensionReturn()
+
+ Constructs a new error page object.
+*/
+
+/*!
\class QWebPage::ChooseMultipleFilesExtensionOption
\since 4.5
\brief The ChooseMultipleFilesExtensionOption class describes the option