| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Add images to the examples.
- Add instructions for running the examples
- Edit for grammar and style
- Add dependencies to Qt WebEngine and Qt WebSockets modules
- Add a workaround for preventing autolinking of WebChannel,
WebEngine and WebSockets to the wrong targets
- Use explicit linking where necessary
Change-Id: Ia4025284063fa09c9e2a0b2c347ee682bba8a615
Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
(cherry picked from commit 01ea92c7c8d77d3d3c10ab1cc4bf4f214aa07126)
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I52dc7e8ad7a9ce6fa36ad2d6ce5d8ea29b77b400
|
| |
| |
| |
| |
| | |
Change-Id: Iccf9f6e0e9358ba42576fb67a0b356c7414d911e
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
|/
|
|
|
|
|
|
|
|
| |
From Qt 5.7 -> examples are lisenced under BSD license, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new BSD header instead of LGPL21 one
(in those files which will be under BSD)
Change-Id: I67629f4d4480e9ba566d7539d62c7cd4e89342e3
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: Iebed549451f58a9fbdd86adf5d0340412d7766d7
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Implemented a C++ Server, providing a chatservice through a simple
QObject using QWebChannel and also both a QML and HTML Client to
interact with the server.
The examples show how to use properties, signals and methods,
separated in server and clients.
This reverts commit e8c280a15f7822fa5a563388615313858fd90848.
The integration issues w.r.t. unconditional usage of the
websockets module have been resolved.
Change-Id: I4a07646dcd5e6050d3bd6b9bd1c5b07dbc7d7d69
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
|
|
|
|
|
|
| |
This reverts commit e9ec067e628564e0b065c625dcd7e695857706ac which breaks qt5.git integration
Change-Id: I92f23d1c0891ed0e52348ab36b73541027095146
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
|
|
Implemented a C++ Server, providing a chatservice through a simple
QObject using QWebChannel and also both a QML and HTML Client to
interact with the server.
The examples show how to use properties, signals and methods,
separated in server and clients.
Change-Id: I20c84c2104d0bb599ead1771aad499e59657f83e
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|