delta/qt5/qtwebsockets.git, branch 5.4.1 code.qt.io: qt/qtwebsockets.git QWebSocket should remember close code and reason 2014-12-29T15:49:54+00:00 Frederik Gladhorn frederik.gladhorn@theqtcompany.com 2014-12-02T12:15:54+00:00 5f8093e6f985a7a887ffaa1e2fecd7314b5444c6 Task-number: QTBUG-42982 Change-Id: I50dbff96d7d64a5213e6ea6ba7bb9429b21b1fb2 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> 
Task-number: QTBUG-42982
Change-Id: I50dbff96d7d64a5213e6ea6ba7bb9429b21b1fb2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Bump version 2014-12-12T12:49:14+00:00 Oswald Buddenhagen oswald.buddenhagen@theqtcompany.com 2014-12-12T12:49:14+00:00 df320becb3d23ea99bf1ddfc190557e7a1729928 Change-Id: I5b6f91f66cd5e9379f411952bce59c0364e2065c 
Change-Id: I5b6f91f66cd5e9379f411952bce59c0364e2065c
Hardcode QtQml version import in .pro file 2014-12-05T08:02:35+00:00 Kai Koehne kai.koehne@theqtcompany.com 2014-12-04T10:04:10+00:00 df6cc41fbdbed5d61bb43e491c2f2eea32cdc596 This allows the plugins.qmltypes file to be updated by just running make qmltypes Change-Id: I0872082645e9d4d8879e3a3479aea80494248894 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> 
This allows the plugins.qmltypes file to be updated by just running

   make qmltypes

Change-Id: I0872082645e9d4d8879e3a3479aea80494248894
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Set parent of internal server objects 2014-11-18T17:57:44+00:00 Peter Kümmel syntheticpp@gmx.net 2014-08-02T12:48:32+00:00 64927e04f202d33b9a9a1f94141ef692c0b513ac After moving the websocket server into another thread current code doesn't work because then the QTcpServer/QSslServer objects reside in a different thread: "QWarning: QObject: Cannot create children for a parent that is in a different thread." QObject::moveToThread(QThread*) also moves QObjects's children, therefore the internal server objects need to be children of QWebSocketServer. Change-Id: Ic7e8a564cd87400a4ab7258e3799157ed359c098 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> 
After moving the websocket server into another thread
current code doesn't work because then the QTcpServer/QSslServer
objects reside in a different thread:
"QWarning: QObject: Cannot create children for a parent that is in a different thread."

QObject::moveToThread(QThread*) also moves QObjects's children, therefore the
internal server objects need to be children of QWebSocketServer.

Change-Id: Ic7e8a564cd87400a4ab7258e3799157ed359c098
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Merge remote-tracking branch 'origin/5.3' into 5.4 2014-11-03T12:48:23+00:00 Oswald Buddenhagen oswald.buddenhagen@digia.com 2014-11-03T12:48:18+00:00 44a071396e91de32eb3efd12a1ed230ed1632aea Change-Id: I0e89ede5ea173f2e831c42d250ddb2b21b42b89b 
Change-Id: I0e89ede5ea173f2e831c42d250ddb2b21b42b89b
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>