summaryrefslogtreecommitdiff
path: root/src/webchannel/doc/src/index.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'src/webchannel/doc/src/index.qdoc')
-rw-r--r--src/webchannel/doc/src/index.qdoc28
1 files changed, 18 insertions, 10 deletions
diff --git a/src/webchannel/doc/src/index.qdoc b/src/webchannel/doc/src/index.qdoc
index 5d012dc..5f354bd 100644
--- a/src/webchannel/doc/src/index.qdoc
+++ b/src/webchannel/doc/src/index.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com>
-** Contact: http://www.qt-project.org/legal
+** Contact: http://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -10,15 +10,15 @@
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
+** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
** will be met: http://www.gnu.org/copyleft/fdl.html.
** $QT_END_LICENSE$
@@ -31,13 +31,21 @@
\title Qt WebChannel
\brief Bridges the gap between Qt applications and HTML/JavaScript.
- The Qt WebChannel module provides a library for seamless integration of C++ and QML applications
- with HTML/JavaScript clients. Any QObject can be published to remote clients, where its public
- API becomes available.
+ Qt WebChannel enables peer-to-peer communication between the host
+ (QML/C++ application) and the client (HTML/JavaScript application). The
+ transport mechanism is supported out of the box by the two popular web
+ engines, Qt WebKit 2 and Qt WebEngine (experimental). It works on all
+ browsers that support Qt WebSockets, enabling Qt WebChannel applications
+ to run in any JavaScript runtime. Additionally, a custom transport
+ mechanism can also be implemented using Qt WebSockets to support Qt
+ WebChannel-based communication.
- \section1 Related Information
+ The module provides a JavaScript library for seamless integration of C++
+ and QML applications with HTML/JavaScript clients. The client must use the
+ JavaScript library to access the serialized QObjects published by the host
+ applications.
- For more information on how to use this module, please refer to the following pages:
+ \section1 Related Information
\list
\li \l{Qt WebChannel JavaScript API}{JavaScript API}