summaryrefslogtreecommitdiff
path: root/examples/webchannel/shared
Commit message (Collapse)AuthorAgeFilesLines
* Allow examples to be built without module sourcesKai Koehne2017-09-061-0/+427
| | | | | | | | | | | | | | | | | | | | | | qwebchannel.js is used by examples, which so far tried to copy it directly from the library source directory. However, in the case of an installed prefix build of Qt, the library sources are not available. This patches therefore moves the qwebchannel.js file to the examples directory, which is installed including sources. The obvious alternative would be copying the file inside the source tree, but that causes code duplication and a maintenance burden that we want to avoid. Another alternative would have been to install qwebchannel.js into QT_INSTALL_DATA, or extract the file at build time from the Qt library. However, this requires bigger changes, and is also dubious because the use case are in particular applications _not_ using Qt. Task-number: QTBUG-57654 Change-Id: I96bc93b6e3d248e4b4facdd582d9fa53ae562924 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Examples: Fix coding style issuesKai Koehne2017-08-291-1/+1
| | | | | Change-Id: Ifdd0a9117bc354c342728949e45d1ac431495ef4 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Examples: Use override keywordKai Koehne2017-08-291-1/+1
| | | | | | | Every C++11 compliant compiler has to support it. Change-Id: I143647aaeba6d49f9ab48abaffad0d77a8abbffd Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Examples: Use signals and slots keywordsKai Koehne2017-08-292-3/+3
| | | | | | | Examples are not compiled with QT_NO_KEYWORDS. Change-Id: I6bff2b4cc46bd53ef2f1879951e59089734a3864 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Examples: Use nullptrKai Koehne2017-08-291-1/+1
| | | | | Change-Id: I93688ed891e1cdd6815af0ea22507190c34c0bba Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Examples: Use canonical include guardsKai Koehne2017-08-291-3/+3
| | | | | Change-Id: I0806cb50a46da19e3538855b348cbdaa2c4f96e1 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Examples: Do not put example code in Qt namespaceKai Koehne2017-08-294-15/+5
| | | | | | | | Instead just wrap forward-declared Qt classes. See also https://wiki.qt.io/Writing_Qt_Examples Change-Id: I3707bb6ee5577e49a6b860e8f1c21b6aaf6405c2 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Fix include orderFrank Meerkoetter2016-04-131-2/+1
| | | | | | | Includes go from most specific to least specific Change-Id: I86aa972dbb09a31142c443dd88f1930e91bf2803 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Fix typoFrank Meerkoetter2016-04-131-1/+1
| | | | | Change-Id: I434c84d04d8e8d427bec4fd9f0f9ee20c54e7fc5 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Updated license headersAntti Kokko2016-01-204-68/+136
| | | | | | | | | | 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>
* Remove transports when the underlying socket gets disconnectFrank Meerkoetter2015-08-191-0/+2
| | | | | | | | | This will cause the transport to be removed from the "transports" member of the QQmlWebChannel. Otherwise it would linger around eating resources. Thanks to Jannis Voelker for pointing it out. Change-Id: I5aca499dfd0bdefc075fa5717436ab0919ec6ab1 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Fix resource leakFrank Meerkoetter2015-08-191-1/+1
| | | | | | | | The transport owns the socket and should therefore delete it. Kudos to Jannis Voelker for pointing it out. Change-Id: Ie6df93c92e00ac64bc4c329b68cbc9c6598257ab Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Update copyright headersv5.5.0-alpha1Antti Kokko2015-02-174-24/+24
| | | | | | | | | 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>
* Added some more examplesBernd Lamecker2014-10-164-0/+295
| | | | | | | | | | | | | | | 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>
* Revert "Added some more examples"Jani Heikkinen2014-10-134-295/+0
| | | | | | | This reverts commit e9ec067e628564e0b065c625dcd7e695857706ac which breaks qt5.git integration Change-Id: I92f23d1c0891ed0e52348ab36b73541027095146 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Added some more examplesBernd Lamecker2014-10-104-0/+295
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>
View Lorry Controller Status