delta/qt5/qtwebchannel.git - code.qt.io: qt/qtwebchannel.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1	Liang Qi	2016-05-19	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .qmake.conf Change-Id: I52dc7e8ad7a9ce6fa36ad2d6ce5d8ea29b77b400
\| *	fix example installs	Oswald Buddenhagen	2016-04-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Change-Id: Iccf9f6e0e9358ba42576fb67a0b356c7414d911e Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* \|	Updated license headers	Antti Kokko	2016-01-20	1	-17/+34
\|/ \| \| \| \| \| \| \| \| \|	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>
*	Update copyright headersv5.5.0-alpha1	Antti Kokko	2015-02-17	1	-21/+13
\| \| \| \| \| \| \| \| \|	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 a generic node.js debug client as an example	Sumedha Widyadharma	2014-09-19	4	-0/+175
	qwclient can connect to any qwebchannel server using a websocket transport. The service can then be used through a REPL. It can, for instance, be used with the standalone example server. Change-Id: Ie73d19b0376caf2fcf6ae02ec19a56e27bddfd33 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>