delta/qt5/qtwebsockets.git, branch v5.6.0-alpha1 code.qt.io: qt/qtwebsockets.git Merge remote-tracking branch 'origin/5.5' into 5.6 2015-08-21T12:59:26+00:00 Liang Qi liang.qi@theqtcompany.com 2015-08-21T12:58:54+00:00 c5f63b60330c05a5b70d5f5f42565f32227f161b Change-Id: Ica80f965969095793f45e9a5b724335ac0a79040 
Change-Id: Ica80f965969095793f45e9a5b724335ac0a79040
Merge remote-tracking branch 'origin/5.4' into 5.5 2015-08-19T14:31:08+00:00 Liang Qi liang.qi@theqtcompany.com 2015-08-19T14:31:08+00:00 a01c1455afecc2a98598a574f69ce682586357ff Conflicts: .qmake.conf Change-Id: I3f9a7c0afccb925e1b821ca7191dab4e1855cc21 
Conflicts:
	.qmake.conf

Change-Id: I3f9a7c0afccb925e1b821ca7191dab4e1855cc21
Add the GPLv3 license text 2015-08-13T13:11:29+00:00 Thiago Macieira thiago.macieira@intel.com 2015-07-08T00:35:11+00:00 bb684104f8d5c619a3e55f8b6cfa259cc154016b LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> 
LGPLv3 refers to it but does not include it in its body.

Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Merge remote-tracking branch 'origin/5.5' into dev 2015-08-09T13:27:40+00:00 Frederik Gladhorn frederik.gladhorn@theqtcompany.com 2015-08-09T13:27:39+00:00 483fe6ca7b9cc011c648c3cacb48b609d741b407 Change-Id: Ia29cf611432e0be43e0eaf04384e48f68c93af3e 
Change-Id: Ia29cf611432e0be43e0eaf04384e48f68c93af3e
WebSocketServer: use int type for port 2015-07-22T10:32:07+00:00 Liang Qi liang.qi@theqtcompany.com 2015-07-13T06:54:48+00:00 0610115192f4a1e4d722330bf298ccd213ca3b5f QML engine doesn't support quint16 as a QML type. Task-number: QTBUG-46790 Change-Id: I5b01dc06a3256dd41affc035fc507082e1935cc8 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> 
QML engine doesn't support quint16 as a QML type.

Task-number: QTBUG-46790
Change-Id: I5b01dc06a3256dd41affc035fc507082e1935cc8
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Luca Niccoli <lultimouomo@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Don't pass enum type by-ref in foreach 2015-07-09T11:00:54+00:00 Sergio Martins sergio.martins@kdab.com 2015-07-09T10:23:09+00:00 8073e6dc16470c0723cc30c74a2af7fb315733d2 Change-Id: I1d05bcfee5715cd06285252202ac00aaa80825eb Reviewed-by: Marc Mutz <marc.mutz@kdab.com> 
Change-Id: I1d05bcfee5715cd06285252202ac00aaa80825eb
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Merge remote-tracking branch 'origin/5.5' into dev 2015-06-30T14:26:08+00:00 Liang Qi liang.qi@theqtcompany.com 2015-06-29T18:24:40+00:00 c55e385f1f70f11d3ffd0f8372ccb8e7405018c5 Conflicts: .qmake.conf src/websockets/qwebsocket_p.cpp Change-Id: Ibcc1898263cc8bc80066370f045df6a217e46574 
Conflicts:
	.qmake.conf
	src/websockets/qwebsocket_p.cpp

Change-Id: Ibcc1898263cc8bc80066370f045df6a217e46574
Bump version 2015-06-29T08:48:23+00:00 Oswald Buddenhagen oswald.buddenhagen@theqtcompany.com 2015-06-29T08:48:23+00:00 086f3722777ee61f3c019ca064d4a844cf0f6fe4 Change-Id: Ie226303b4a1059c22fa5752adcb621fcc05a53e8 
Change-Id: Ie226303b4a1059c22fa5752adcb621fcc05a53e8
Fix incorrectly encoded data tag 2015-06-27T13:04:47+00:00 Simon Hausmann simon.hausmann@theqtcompany.com 2015-06-27T11:58:32+00:00 a3e0fe474c20eb526af9668c5cc97cf7055c77fa Properly encode the provided sequence in UTF-8, so that the XML output of testlib is correctly encoded. Otherwise parsing the XML output in an automated manner breaks. Change-Id: Ibf0d5d6d067f4daeb7d2efd242d64b5f472d7b83 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> 
Properly encode the provided sequence in UTF-8, so that the XML output of
testlib is correctly encoded. Otherwise parsing the XML output in an automated
manner breaks.

Change-Id: Ibf0d5d6d067f4daeb7d2efd242d64b5f472d7b83
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Merge remote-tracking branch 'origin/5.5.0' into 5.5 2015-06-26T12:05:17+00:00 Liang Qi liang.qi@theqtcompany.com 2015-06-26T12:05:17+00:00 f6654651baa2b799f49c0fb7417866505b9106d7 Change-Id: Ieca9be8fcf6c0411442478babe3a47a681cbf63c 
Change-Id: Ieca9be8fcf6c0411442478babe3a47a681cbf63c