delta/qt5/qtwebsockets.git, branch 5.10 code.qt.io: qt/qtwebsockets.git Merge remote-tracking branch 'origin/5.9' into 5.10 2018-01-18T17:10:56+00:00 Liang Qi liang.qi@qt.io 2018-01-18T17:04:24+00:00 f8665a7cf5e18e5e40ad3e50039ba0362c5d2ec7 Conflicts: .qmake.conf Change-Id: I4a88ddf6722f4b29512fbec71f3d055591e625ba 
 Conflicts:
	.qmake.conf

Change-Id: I4a88ddf6722f4b29512fbec71f3d055591e625ba
Merge remote-tracking branch 'origin/5.9.4' into 5.9 2018-01-18T10:02:36+00:00 Liang Qi liang.qi@qt.io 2018-01-18T10:02:36+00:00 78607d656e18717e2edb5e0430e7eeefaf24fa8b Change-Id: I394635e8722f98fb57b305e26264047feafc3b4f 
Change-Id: I394635e8722f98fb57b305e26264047feafc3b4f
Add binary compatibility file for QtWebSockets for 5.10 2018-01-09T06:31:30+00:00 Milla Pohjanheimo milla.pohjanheimo@qt.io 2017-12-12T11:27:09+00:00 f5ea17db7f103bb28f210d96c5b82b4315799930 File to test binary compatibility for 5.10 added Change-Id: Iade26098325ba00e45cc055c9ebf8ff8fe2cd67b Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> 
File to test binary compatibility for 5.10 added

Change-Id: Iade26098325ba00e45cc055c9ebf8ff8fe2cd67b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Add changes file for Qt 5.9.4 2018-01-08T08:54:44+00:00 Antti Kokko antti.kokko@qt.io 2018-01-04T11:56:23+00:00 fc5247f669d0aecfef861191682fba5518175e34 Change-Id: Ic6f8ac83bd779f4ba0576c9f849f9d7afa77a412 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io> 
Change-Id: Ic6f8ac83bd779f4ba0576c9f849f9d7afa77a412
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
Bump version 2017-12-20T11:06:56+00:00 Oswald Buddenhagen oswald.buddenhagen@qt.io 2017-12-20T11:06:56+00:00 91bb3576f7787041ab85d0ff6c0dfe2ce26281b9 Change-Id: I4e8cb48a3626209222ddada7a7560150f6382074 
Change-Id: I4e8cb48a3626209222ddada7a7560150f6382074
Bump version 2017-12-12T08:55:16+00:00 Oswald Buddenhagen oswald.buddenhagen@qt.io 2017-12-12T08:55:16+00:00 bd08a6ba75ed04089fb2fa3e763ade8ebc1ef9da Change-Id: Ide48dd1b6e21a6441473c7e408c7cf5513fd30db 
Change-Id: Ide48dd1b6e21a6441473c7e408c7cf5513fd30db
Merge remote-tracking branch 'origin/5.10.0' into 5.10 2017-12-08T12:59:45+00:00 Liang Qi liang.qi@qt.io 2017-12-08T12:59:44+00:00 30e3ccc84031e5530ee38ab4a790267557067205 Change-Id: I1b001ff2a374ec53a9247adc2d91db12ef2a8923 
Change-Id: I1b001ff2a374ec53a9247adc2d91db12ef2a8923
Fix apparently invalid auto-test (qmlwebsockets) 2017-11-29T12:41:41+00:00 Timur Pocheptsov timur.pocheptsov@qt.io 2017-11-29T09:23:02+00:00 1b9a3c75259ceaa5e475b47e396a548c475df401 It makes sense to first start listening (server.listen = true) and then connect (socket.active = true). Task-number: QTBUG-59388 Change-Id: I4235dad87ee3a62ebf75cec39e5d9fa4b7ed7552 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> 
It makes sense to first start listening (server.listen = true) and then
connect (socket.active = true).

Task-number: QTBUG-59388
Change-Id: I4235dad87ee3a62ebf75cec39e5d9fa4b7ed7552
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Merge remote-tracking branch 'origin/5.9.3' into 5.9 2017-11-23T08:50:56+00:00 Liang Qi liang.qi@qt.io 2017-11-23T08:50:56+00:00 4577179620f98be257ad745c5b406d92b3b16aba Change-Id: Iea2ec6f528dfcbbedabfc6cac01293ace2d26835 
Change-Id: Iea2ec6f528dfcbbedabfc6cac01293ace2d26835
Merge remote-tracking branch 'origin/5.9.3' into 5.10.0 2017-11-21T10:05:47+00:00 Liang Qi liang.qi@qt.io 2017-11-21T10:05:47+00:00 0e4b43383dd826b5927f6276033f52ede1fa7936 Change-Id: I3ac04c00c6da760a0125970c55866055709a3371 
Change-Id: I3ac04c00c6da760a0125970c55866055709a3371