delta/qt5/qtwebsockets.git, branch v5.4.0 code.qt.io: qt/qtwebsockets.git Merge remote-tracking branch 'origin/5.3' into 5.4.0 2014-11-10T10:12:36+00:00 Oswald Buddenhagen oswald.buddenhagen@digia.com 2014-11-10T10:10:50+00:00 d1c9ede19976767393fe5db2f396c0c18d6fbced Change-Id: Iae18d5786396e50244c59773b3b0289347e3ef45 
Change-Id: Iae18d5786396e50244c59773b3b0289347e3ef45
Fix invalid Date header field in handshake response 2014-11-03T10:38:58+00:00 Joni Poikelin joni.poikelin@digia.com 2014-08-19T12:35:57+00:00 7aeea581882425be657123d2945c7165c7063aab Fix invalid Date header in handshake response on systems with non- english system locale. Task-number: QTBUG-40866 Change-Id: If6d5cc55e879eff259698e87c9cda753990245e7 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> 
Fix invalid Date header in handshake response on systems with non-
english system locale.

Task-number: QTBUG-40866
Change-Id: If6d5cc55e879eff259698e87c9cda753990245e7
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Make QWebSocketPrivate::makeConnections() take care of all connections. 2014-11-03T10:38:47+00:00 Christian Kandeler christian.kandeler@digia.com 2014-09-15T15:07:33+00:00 d6a24fd24597af8cdff5944d32a54acb01b806f3 Otherwise all code that calls it has to handle the other connections separately, which is error-prone and has actually been forgotten for the case where the QWebSocket is created via upgradeFrom(). Task-number: QTBUG-39551 Change-Id: I4d1e4faa1594b53e7a8dccc9ce13ef2c323b1c61 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> 
Otherwise all code that calls it has to handle the other connections
separately, which is error-prone and has actually been forgotten for the
case where the QWebSocket is created via upgradeFrom().

Task-number: QTBUG-39551
Change-Id: I4d1e4faa1594b53e7a8dccc9ce13ef2c323b1c61
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Compile fix without proxy support 2014-11-03T10:38:44+00:00 Maurice Kalinowski maurice.kalinowski@digia.com 2014-07-07T11:19:50+00:00 4ccbf920d63ae1bf52b8a3bf6c795822172acc24 This is required for for the autotests to compile. Change-Id: I8cd1ad11ca5d28e2d1ade06649cf6c2e1eee9a2c Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> (cherry picked from commit aef4cba4ce5f3acfa6765c71283d9363dffe97b7) 
This is required for for the autotests to compile.

Change-Id: I8cd1ad11ca5d28e2d1ade06649cf6c2e1eee9a2c
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
(cherry picked from commit aef4cba4ce5f3acfa6765c71283d9363dffe97b7)
Also forward the bytesWritten(qint64) signal 2014-10-15T15:15:19+00:00 Peter Kümmel syntheticpp@gmx.net 2014-09-20T06:23:03+00:00 0854eda408de542047a0ef38c37953719a8f9fde The signal bytesWritten(qint64) is part of the public API and should be emitted. Seems it was just forgotten. Change-Id: I85a56c22581c6bd3ecc504add34aeeabc76f4d2a Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> 
The signal bytesWritten(qint64) is part of the public API
and should be emitted. Seems it was just forgotten.

Change-Id: I85a56c22581c6bd3ecc504add34aeeabc76f4d2a
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Update the plugins.qmltypes meta data. 2014-10-14T11:25:21+00:00 Milian Wolff mail@milianw.de 2014-07-03T11:31:01+00:00 4c7611e7309f21e8a1dfa9ddcd84d91cd979519c I forgot to do this when I introduced the QQmlWebSocketServer. Change-Id: I7fd7354cf42f633973e0da71d854594627e2fb97 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> 
I forgot to do this when I introduced the QQmlWebSocketServer.

Change-Id: I7fd7354cf42f633973e0da71d854594627e2fb97
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Improve the integration of QtWebsockets into general Qt docs 2014-09-28T17:52:58+00:00 Alex Blasche alexander.blasche@digia.com 2014-09-26T10:06:10+00:00 f6175568bb32b87a3d6cd55382fa1c8e1a1de2b4 1.) The websocket qml types page is now hooked into Qt's QML Type by Module page. 2.) Correct incorrectly documented import statement for Qt.WebSockets module in QML. 3.) Add missing \since tags (see QTBUG-36775). Change-Id: I1321db70215fcd16cfbd77dd71a459244241d8a3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> 
1.) The websocket qml types page is now hooked into Qt's QML Type by Module
page.

2.) Correct incorrectly documented import statement for Qt.WebSockets
module in QML.

3.) Add missing \since tags (see QTBUG-36775).

Change-Id: I1321db70215fcd16cfbd77dd71a459244241d8a3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Merge remote-tracking branch 'origin/5.3' into 5.4 2014-09-16T13:29:54+00:00 Frederik Gladhorn frederik.gladhorn@digia.com 2014-09-16T13:29:54+00:00 4301d626f8e6e2dabf3a71205eb632f001827a7f Conflicts: .qmake.conf Change-Id: Ib38d0c86aa010b06b9a201115dfbc9f091abeb0e 
Conflicts:
	.qmake.conf

Change-Id: Ib38d0c86aa010b06b9a201115dfbc9f091abeb0e
Fix QWebSocketServer for clients preferring lowercase http headers. 2014-09-09T06:22:56+00:00 Jorma Tähtinen Jorma.Tahtinen@digia.com 2014-08-06T13:12:54+00:00 ea22c846b285ee4f71efc0fc050a4759880433a8 QWebSocketServer should not use case-sensitive compare to validate http headers for incoming connections. Change-Id: Ie7b8a9f6ca1a0b547eb7a924f6392395f812b0e3 Task-number: QTBUG-40615 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> 
QWebSocketServer should not use case-sensitive compare to validate
http headers for incoming connections.

Change-Id: Ie7b8a9f6ca1a0b547eb7a924f6392395f812b0e3
Task-number: QTBUG-40615
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Bump version 2014-08-29T09:33:48+00:00 Frederik Gladhorn frederik.gladhorn@digia.com 2014-08-29T09:33:48+00:00 c98ca1256d40a59612b31c78c3e4f2f01e1b861f Change-Id: I7da486fc6640df27695971c70bbb50a842b9cca2 
Change-Id: I7da486fc6640df27695971c70bbb50a842b9cca2