qt/qtwebsockets.git - Qt WebSockets

	Commit message (Collapse)	Author	Age	Files	Lines
*	Replace Q_NULLPTR with nullptr	Kevin Funk	2017-09-26	1	-1/+1
\| \| \| \| \|	Change-Id: I0988a4119b5bd790d286c16b5647d97d4d95aef0 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
*	Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1	Liang Qi	2016-05-19	1	-0/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .qmake.conf Change-Id: I80cd189fc82481fdc2241db6d2a7d95537c340a6
\| *	add example installs	Oswald Buddenhagen	2016-05-06	1	-0/+3
\| \| \| \| \| \| \| \| \| \|	Change-Id: I49d9fda43374776685d2ab1fa653287447d34028 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* \|	Updated license headers	Antti Kokko	2016-01-20	3	-52/+103
\|/ \| \| \| \| \| \| \| \| \|	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: I0166fb7434185f9d151631a51124945150cdd633 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
*	Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5	Frederik Gladhorn	2015-02-24	3	-6/+25
\|\
\| *	Examples: add an option for debug outputs in echoclient	Liang Qi	2015-02-17	3	-6/+25
\| \| \| \| \| \| \| \| \| \|	Change-Id: I9bec2324b666c00212135ef6c9d5a69594cda050 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* \|	Update copyright headers	Jani Heikkinen	2015-02-16	3	-18/+18
\|/ \| \| \| \| \| \| \| \| \|	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: I8467410bfad44e8d3fe6bd5724c61bb0c07c91f9 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
*	Update license headers and add new license filesv5.4.0-alpha1	Antti Kokko	2014-08-24	3	-54/+30
\| \| \| \| \| \| \|	- Added LICENSE.LGPLv3, LICENSE.GPLv2 & LICENSE.LGPLv21 Change-Id: I0586e35a7aa99be1b5b3bda580b05897f451acbf Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
*	Use the proper protocol names	Sze Howe Koh	2014-04-09	1	-1/+1
\| \| \| \| \| \| \| \|	- "WebSocket" is one word, with uppercase 'W' and 'S'. - "HTTP"/"HTTPS" is fully uppercase Change-Id: Ice3a50c94394433c97f7347291af5cda69b234ce Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
*	Move examples into 'websockets' folder	Kai Koehne	2014-03-19	4	-0/+204
	In the packaging process the content of all 'examples' folders are copied together into one folder ... so modules are supposed to have their submodule name as a sub-folder of 'examples'. Change-Id: I9981b914e8268c932ca5a3d1c9fa73f8db0b6a5b Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>