summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-10-03 11:32:44 (GMT)
committerVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-10-03 11:32:44 (GMT)
commit610427e8849c0c81c5f8658d24278edb199f68a3 (patch)
treeecd10238f51b806f7256cf88c15070e9afa4e3bc /src
parent3f638e17143ce9ad406ae2a7705797f4e2959bc9 (diff)
downloadQt-610427e8849c0c81c5f8658d24278edb199f68a3.zip
Qt-610427e8849c0c81c5f8658d24278edb199f68a3.tar.gz
Qt-610427e8849c0c81c5f8658d24278edb199f68a3.tar.bz2
Doc: Document HTML and status as properties.
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp
index d8d9d64..2a0ee20 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp
@@ -392,7 +392,8 @@ void QGraphicsWebView::setGeometry(const QRectF& rect)
}
/*!
- \brief The load status message associated to the web graphicsitem
+ \property QGraphicsWebView::status
+ \brief the load status message.
Provides the latest status message set during the load of a URL.
Commonly shown by Status Bar widgets.
@@ -492,14 +493,15 @@ void QGraphicsWebView::load(const QNetworkRequest& request,
}
/*!
- Sets the content of the web graphicsitem to the specified \a html.
+ \property QGraphicsWebView::html
+ This property provides an HTML interface to the text in the webview.
- External objects such as stylesheets or images referenced in the HTML
- document are located relative to \a baseUrl.
+ When setting this property, external objects such as stylesheets or images
+ referenced in the HTML document are located relative to \a baseUrl.
The \a html is loaded immediately; external objects are loaded asynchronously.
- When using this method, WebKit assumes that external resources such as
+ When using these methods, WebKit assumes that external resources such as
JavaScript programs or style sheets are encoded in UTF-8 unless otherwise
specified. For example, the encoding of an external script can be specified
through the charset attribute of the HTML script tag. Alternatively, the