summaryrefslogtreecommitdiff
path: root/examples/examples.pro
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fix example documentation and pathsTopi Reinio2014-08-131-1/+1
| | | | | | | | | | | | | | | To fix issues related to example documentation and to follow Qt convention, do the following changes: - Rename examples/qwebchannel to examples/webchannel - Move example-specific documentation to correct location(s) - Include generic 'Running the Example' instructions - Add the module name to example title, fix links This ensures that example docs are built and the example manifest file generated correctly. Change-Id: I284e0b13db95a6738d72258735018b59156cc7da Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Add documentation for the QtWebChannel module.Milian Wolff2014-08-011-3/+1
| | | | | | | | | | | Please proof-read it and tell me what needs to be improved. I assume most people will probably not use the QWebChannel directly. Rather, they will only consume its features indirectly through the integration in QtWebKit/QtWebEngine. Thus the documentation here is for QWebChannel as a library. User-end documentation should be added to QtWebKit, I think. Change-Id: I259c204e24331271b8dc74ea11695988234a79d3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* The standalone example depends on QtWidgetsSumedha Widyadharma2014-07-241-1/+1
| | | | | | | This fixes builds with Qt built without the widgets module. Change-Id: I280b1443c3333d9d199d0b4fe7ee43bffb9c5e6e Reviewed-by: Simo Fält <simo.falt@digia.com>
* Only depend optionally on QtWebSockets, and only use it in the example.Milian Wolff2014-07-041-1/+3
| | | | | | | | | | | | | The utility QWebChannelAbstractTransport implementation based on the QtWebSocket has no big value. Instead, it would pull in the QtWebSocket link-time dependency into QtWebKit/QtWebEngine, which is not desired. Considering that the WebSocket usecase is minor, and only few people will ever use it, we agreed that having the code in the example alone is enough. Change-Id: Ica038329a1d684f33e805fc296e9dff71b1446ba Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Remove examples written by Noam which are under the Nokia license.Milian Wolff2014-01-161-6/+0
| | | | | | | I'll write new examples from scratch using the proper license. Change-Id: If13e57cf8b19cf45178b6fccace59cb56410d84e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add standalone C++/Qt example which opens HTML client in a browser.Milian Wolff2013-12-201-0/+2
| | | | | | | | | | | | | This example shows how to use the (currently quite ugly) raw C++ API to setup a webchannel without using QML at all. The HTML client is then handled by the users default browser. The example itself shows a simple chat between the HTML client and the C++/Qt server, with a line edit for input and a text edit showing the chat history. Change-Id: I8baf14efb9d0c5f5880d99710cf6317fe9b887b9 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Restructure sources and assimilate to Qt module structure.Milian Wolff2013-12-121-3/+5
| | | | | | | | | | | | | | | | | | | | | This module can hopefully be done in time for 5.3. This commit changes the source structure and QMake files to adapt to typical Qt modules. With this in place, we can now use QT += webchannel in qmake files to link against the pure Qt/C++ QtWebChannel library. The QML plugin is separated from it and can be loaded optionally, if the quick module could be found. Also added is now a qmlplugindump for tooling integration. Note that the Qt.labs namespace is removed. The test file structure is also adapted to how its done in the QtDeclarative module. Note that this setup apparently does not support to run tests without running make install first. Change-Id: I1c15d72e7ab5f525d5a6f651f4e965ef86bc17bd Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Remove obsolete CONFIG+=ordered from qmake files.Milian Wolff2013-11-131-1/+0
| | | | | Change-Id: Ide09c6f218bf7af176e03e4741f29cd022f351b8 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Make it possible to build everything in one goMilian Wolff2013-11-011-0/+6
Disable installation of examples Change-Id: I85092b0a22da871fdf02f197d0b85e7dc33243bc Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>