delta/qt5/qtwebsockets.git, branch v5.10.0-beta2 code.qt.io: qt/qtwebsockets.git Merge remote-tracking branch 'origin/5.9' into 5.10 2017-10-11T13:42:27+00:00 Liang Qi liang.qi@qt.io 2017-10-11T13:42:27+00:00 cd26439ac7ca1a444e9b5534a504afb0bb411890 Conflicts: .qmake.conf Change-Id: I4af142703e469b56236b73335a93f6960534c0f1 
 Conflicts:
	.qmake.conf

Change-Id: I4af142703e469b56236b73335a93f6960534c0f1
Replace iterator based loop by range-for-loop 2017-10-10T16:15:59+00:00 André Klitzing aklitzing@gmail.com 2017-10-06T10:59:27+00:00 b05ec56db6f17f04387af72b8e1b9a64b1092daa Found by clazy and fixes "clazy-strict-iterators" warning. Change-Id: I8f50c92ac054d627499440d593faa43ed5b4ad4b Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> 
Found by clazy and fixes "clazy-strict-iterators" warning.

Change-Id: I8f50c92ac054d627499440d593faa43ed5b4ad4b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Replace Q_ENUMS by Q_ENUM 2017-10-10T14:34:28+00:00 André Klitzing aklitzing@gmail.com 2017-10-06T10:52:32+00:00 5775c5e344e94f47af73d0d72a631375fb10d3d5 Change-Id: Ie16c88fb0a215efe5f152ea2d12c984f8d9e0878 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> 
Change-Id: Ie16c88fb0a215efe5f152ea2d12c984f8d9e0878
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Use multi-arg instead of multiple arg calls 2017-10-09T15:04:59+00:00 André Klitzing aklitzing@gmail.com 2017-10-06T11:01:26+00:00 b01ffb0f295fbf39771783da84797231f38b976e Change-Id: Ic1f4b357138457eb33ac9154a280f499664c3c78 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> 
Change-Id: Ic1f4b357138457eb33ac9154a280f499664c3c78
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Bump version 2017-10-06T16:01:19+00:00 Oswald Buddenhagen oswald.buddenhagen@qt.io 2017-10-06T16:01:19+00:00 15ca7cc061285dcaab1c650937c8f3a5bbbdfa28 Change-Id: Ic2a08fd6c43078bf571e37234a52234827537394 
Change-Id: Ic2a08fd6c43078bf571e37234a52234827537394
Revamp WebSocket's simple-chat example 2017-09-28T13:21:27+00:00 Mårten Nordheim marten.nordheim@qt.io 2017-09-25T14:16:58+00:00 71b5fc5dd10e9edce8db886f6c05b7950b3cca6e - Replace Q_* macros with their 'modern' substitutes - Replace a usage of qDebug with QTextStream - Print a little piece of text whenever a client connects - Add a textbox to the html page to set the host to connect to - Enable/disable disconnect and send button based on connection Task-number: QTBUG-60656 Change-Id: Ieec571c3964f94cd464912054acda3208c02c898 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> 
- Replace Q_* macros with their 'modern' substitutes
- Replace a usage of qDebug with QTextStream
- Print a little piece of text whenever a client connects
- Add a textbox to the html page to set the host to connect to
- Enable/disable disconnect and send button based on connection

Task-number: QTBUG-60656
Change-Id: Ieec571c3964f94cd464912054acda3208c02c898
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Add changes file for Qt 5.9.2 2017-09-28T08:59:17+00:00 Liang Qi liang.qi@qt.io 2017-09-28T08:58:25+00:00 492981b93295f575ad77b6767dc5b8851287aa2e Change-Id: Ic2c1569e84296a4cc2c64e5861fac0a7e4176887 Reviewed-by: Liang Qi <liang.qi@qt.io> 
Change-Id: Ic2c1569e84296a4cc2c64e5861fac0a7e4176887
Reviewed-by: Liang Qi <liang.qi@qt.io>
Change assert to null-check 2017-09-20T15:08:11+00:00 Mårten Nordheim marten.nordheim@qt.io 2017-09-20T13:42:54+00:00 0f32f4efc5a9a8b33369013c2ba6c27c78498cf2 Avoids a crash that would happen if readyRead was emitted after calling ::close on the websocket. Task-number: QTBUG-59179 Change-Id: I1e7bd19d99ee068b8699014fac9a72f839632c85 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> 
Avoids a crash that would happen if readyRead was emitted after
calling ::close on the websocket.

Task-number: QTBUG-59179
Change-Id: I1e7bd19d99ee068b8699014fac9a72f839632c85
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Add change file for Qt 5.6.3 2017-09-01T21:50:34+00:00 Liang Qi liang.qi@qt.io 2017-09-01T10:55:37+00:00 30de96f6d7ef01c1c5887405a4ad49cf44a5ab79 Task-number: QTBUG-62724 Change-Id: I944d2a3e296d170913793a3b7185306ec24dac18 Reviewed-by: Liang Qi <liang.qi@qt.io> 
Task-number: QTBUG-62724
Change-Id: I944d2a3e296d170913793a3b7185306ec24dac18
Reviewed-by: Liang Qi <liang.qi@qt.io>
Fix releaseConnections 2017-08-29T17:56:14+00:00 Alan Alpert alan.alpert@bluescape.com 2017-08-22T00:09:54+00:00 dad63663fcc6590353ec426337b0126b967da173 The overload selected when you pass a single object pointer is to disconnect all signals with that object as a receiver. We want to disconnect all signals with that object as a sender, which is done most easily by passing no explicit arguments. Task-number: QTBUG-62667 Change-Id: I3dd9c5aced9160510bff527355ecfbedded690aa Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Romain Pokrzywka <romain.pokrzywka@gmail.com> Reviewed-by: Liang Qi <liang.qi@qt.io> 
The overload selected when you pass a single object pointer is to
disconnect all signals with that object as a receiver. We want to
disconnect all signals with that object as a sender, which is done most
easily by passing no explicit arguments.

Task-number: QTBUG-62667
Change-Id: I3dd9c5aced9160510bff527355ecfbedded690aa
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Romain Pokrzywka <romain.pokrzywka@gmail.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>