summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-202-4/+20
| |\ \ | | |/
| | * fix the port in Host field in handshake requestLiang Qi2015-02-201-2/+14
| | * Fix keyword for OriginLiang Qi2015-02-171-1/+1
| | * Doc: added qmake to dependenciesNico Vertriest2015-02-161-1/+1
| | * Doc: add description and image for echoclient htmlLiang Qi2015-02-131-0/+4
* | | Update copyright headersJani Heikkinen2015-02-1638-225/+225
|/ /
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-132-13/+16
|\ \ | |/
| * Fix the translation in QWebSocketFrameLiang Qi2015-02-102-13/+16
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-191-0/+2
|\ \ | |/
| * QWebSocket should remember close code and reasonv5.4.15.4.1Frederik Gladhorn2014-12-291-0/+2
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-171-0/+2
|\ \ | |/
| * Hardcode QtQml version import in .pro fileKai Koehne2014-12-051-0/+2
* | Rename QML import from "Qt.WebSockets" to "QtWebSockets"Sze Howe Koh2014-12-0110-11/+24
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-214-16/+25
|\ \ | |/
| * Set parent of internal server objectsPeter Kümmel2014-11-182-4/+4
| * Merge remote-tracking branch 'origin/5.3' into 5.4Oswald Buddenhagen2014-11-032-12/+21
| |\
| | * Fix invalid Date header field in handshake response5.3Joni Poikelin2014-11-031-3/+5
| | * Make QWebSocketPrivate::makeConnections() take care of all connections.Christian Kandeler2014-11-031-9/+16
* | | Make the websocket handshake statefullAllan Sandfeld Jensen2014-11-192-39/+82
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-202-0/+51
|\ \ \ | |/ /
| * | Also forward the bytesWritten(qint64) signalPeter Kümmel2014-10-151-0/+1
| * | Update the plugins.qmltypes meta data.Milian Wolff2014-10-141-0/+50
* | | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2014-10-138-3/+11
|\ \ \ | |/ /
| * | Improve the integration of QtWebsockets into general Qt docsv5.4.0-beta1Alex Blasche2014-09-288-3/+11
* | | Fix QWebSocket's handling of query parameters with encoded charactersJuha Turunen2014-10-111-1/+1
|/ /
* | Fix QWebSocketServer for clients preferring lowercase http headers.Jorma Tähtinen2014-09-091-9/+9
* | Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-2435-630/+350
* | Fix build with non-OpenSSL SSL-enabled backendsAndrew Knight2014-08-131-1/+1
* | WinRT: Fix compiler crash (msvc2013 arm)Maurice Kalinowski2014-08-131-0/+11
* | remove some pointless noise from project filesOswald Buddenhagen2014-08-081-6/+1
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-144-5/+5
|\ \ | |/
| * Use 0 instead of Q_NULLPTR in public headers.v5.3.25.3.2Sergio Martins2014-07-114-4/+4
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
* | Add initial support for a declarative WebSocketServer.Milian Wolff2014-07-027-10/+442
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-261-1/+1
|\ \ | |/
| * Fix a typo in proxy handling.Jędrzej Nowacki2014-06-251-1/+1
* | Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-144-2/+8
|\ \ | |/
| * Document WebSocket::sendTextMessage(string message)Richard Moe Gustavsen2014-05-231-0/+5
| * Add missing classname for module in qmldir.v5.3.0Frederik Gladhorn2014-05-093-2/+3
* | Doc: Fix qmlclass selector used in documentation configTopi Reinio2014-06-111-1/+1
* | Add a QUrl serverUrl method to QWebSocketServer.Milian Wolff2014-06-082-0/+39
* | Remove dependency on unused sql moduleFatih Aşıcı2014-05-271-1/+1
* | Copy the more efficient HTTP header parser from QtNetworkThiago Macieira2014-05-091-21/+46
* | Remove superfluous qWarning statementsKurt Pattyn2014-05-051-5/+0
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-1110-39/+39
|\ \ | |/
| * Use correct casing for WebSocketv5.3.0-rc1Kurt Pattyn2014-04-101-1/+1
| * Fix process handshake for servers preferring lowercase http headers.Jędrzej Nowacki2014-04-091-7/+7
| * Use the proper protocol namesSze Howe Koh2014-04-099-29/+29
| * Fix compilation on QNXSergio Ahumada2014-04-041-2/+2
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-249-31/+34
|\ \ | |/