summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-07-20 16:57:22 (GMT)
committerVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-07-20 17:34:44 (GMT)
commit8f2a9e7060f751113999feae4b907e065c9a4e19 (patch)
tree900f39e700b5e441a1ff5029e5dcbd5c6344d999
parent09f7707fda4242c70cb58464d329c704bfaf2a34 (diff)
downloadQt-8f2a9e7060f751113999feae4b907e065c9a4e19.zip
Qt-8f2a9e7060f751113999feae4b907e065c9a4e19.tar.gz
Qt-8f2a9e7060f751113999feae4b907e065c9a4e19.tar.bz2
Doc: fix formatting of lists.
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp29
1 files changed, 17 insertions, 12 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
index c634a7f..f5afbec 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
@@ -270,19 +270,24 @@ void QWebView::setPage(QWebPage *page)
'ftp'. The result is then passed through QUrl's tolerant parser, and
in the case or success, a valid QUrl is returned, or else a QUrl().
- Examples
- - webkit.org becomes http://webkit.org
- - ftp.webkit.org becomes ftp://ftp.webkit.org
- - localhost becomes http://localhost
- - /home/user/test.html becomes file:///home/user/test.html (if exists)
-
- Tips when dealing with URLs and strings
- - When creating a QString from a QByteArray or a char*, always use
- QString::fromUtf8().
- - Do not use QUrl(string), nor QUrl::toString() anywhere where the URL might
- be used, such as in the location bar, as those functions loose data.
- Instead use QUrl::fromEncoded() and QUrl::toEncoded(), respectively.
+ \section2 Examples:
+
+ \list
+ \o webkit.org becomes http://webkit.org
+ \o ftp.webkit.org becomes ftp://ftp.webkit.org
+ \o localhost becomes http://localhost
+ \o /home/user/test.html becomes file:///home/user/test.html (if exists)
+ \endlist
+ \section2 Tips when dealing with URLs and strings:
+
+ \list
+ \o When creating a QString from a QByteArray or a char*, always use
+ QString::fromUtf8().
+ \o Do not use QUrl(string), nor QUrl::toString() anywhere where the URL might
+ be used, such as in the location bar, as those functions loose data.
+ Instead use QUrl::fromEncoded() and QUrl::toEncoded(), respectively.
+ \endlist
*/
QUrl QWebView::guessUrlFromString(const QString &string)
{