summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorMilian Wolff <milian.wolff@kdab.com>2014-08-01 15:20:35 +0200
committerMilian Wolff <milian.wolff@kdab.com>2014-08-04 14:52:07 +0200
commit0ed8f57e9aba977acede9496a83401058f3b090b (patch)
tree9c02e3ab36780bb9fd8780c01e7a75ff439a1065 /README.md
parentaa75a39b3e3a4ae762f05b4a2e91d9790c8d5c88 (diff)
downloadqtwebchannel-0ed8f57e9aba977acede9496a83401058f3b090b.tar.gz
Fixup documentation issues.
These issues were raised by Sze Howe Koh in code review 89965 of change I259c204e. This change set does not yet include any comparison to the old Qt WebKit bridging functionality. I'll hand this in later. Change-Id: Idc7df0e02bfcda3c3fcf1a4e147c1dfac4f18a64 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Diffstat (limited to 'README.md')
-rw-r--r--README.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md
index 111c76f..aa10ffb 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
The Qt WebChannel module offers Qt applications a seamless way to publish `QObjects` for interaction
with HTML/JavaScript clients. These clients can either be inside local Qt `WebView`s or any other,
potentially remote, client which supports JavaScript, as long as a communication channel such
-as WebSockets is available.
+as WebSocket is available.
Qt WebChannel uses introspection on the `QObject`s and sends this serialized data to the clients.
There, with the help of a small JavaScript library, an object is created which simulates the API of
@@ -12,7 +12,7 @@ written. Additionally you can connect to signals and register JavaScript callbac
### Dependencies
-This module depends on Qt Core only. Optionally, an additional plugin for Qt Quick is build, which
+This module depends on Qt Core only. Optionally, an additional plugin for Qt Quick can be built, which
makes it easy to use a `QWebChannel` from QML. Note that this module alone is not functional. It
is being used in e.g. Qt WebKit to provide a seamless integration of QML/C++ QObjects into JavaScript
clients. You can integrate it in your projects as well, by providing an implementation of the
@@ -30,7 +30,7 @@ To use the Qt/C++ library, add the following to your `QMake` project:
QT += webchannel
-Then, in your C++ code, construct a a webchannel, then publish your `QObject`s:
+Then, in your C++ code, construct a webchannel, then publish your `QObject`s:
QWebChannel channel;
channel.registerObject(QStringLiteral("foo"), myFooObj);