summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-06-18 13:42:08 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-06-18 13:42:08 (GMT)
commit749f153aacf60e085231bb3d0bf264f39eaebb82 (patch)
tree212dd513daccee41dca4a581bb53df1ad1a4d1ed /src/3rdparty
parent9e7f0b9e45cef278c8874539257b4038a0aa6615 (diff)
downloadQt-749f153aacf60e085231bb3d0bf264f39eaebb82.zip
Qt-749f153aacf60e085231bb3d0bf264f39eaebb82.tar.gz
Qt-749f153aacf60e085231bb3d0bf264f39eaebb82.tar.bz2
Doc: Fixed documentation errors.
Reviewed-by: Trust Me
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/docs/qtwebkit-bridge.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit-bridge.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit-bridge.qdoc
index fa93293..c2a38fd 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit-bridge.qdoc
+++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit-bridge.qdoc
@@ -8,7 +8,7 @@
The QtWebKit bridge is a mechanism that extends WebKit's JavaScript environment to access native
objects that are represented as \l{QObject}s. It takes advantage of the \l{QObject} introspection,
- a part of the \l{Qt Object Model}, which makes it easy to integrate with the dynamic JavaScript environment,
+ a part of the \l{Object Model}, which makes it easy to integrate with the dynamic JavaScript environment,
for example \l{QObject} properties map directly to JavaScript properties.
For example, both JavaScript and QObjects have properties: a construct that represent a getter/setter
@@ -24,7 +24,7 @@
applications. For example, an application that contains a media-player, playlist manager, and music store.
The playlist manager is usually best authored as a classic desktop application,
with the native-looking robust \l{QWidget}s helping with producing that application.
- The media-player control, which usually looks custom, can be written using \l{The Graphics View framework}
+ The media-player control, which usually looks custom, can be written using the \l{Graphics View framework}
or with in a declarative way with \l{QtDeclarative}. The music store, which shows dynamic content
from the internet and gets modified rapidly, is best authored in HTML and maintained on the server.