summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-092-8/+14
|\
| * WebSocketServer: use int type for portLiang Qi2015-07-222-8/+14
* | Don't pass enum type by-ref in foreachSergio Martins2015-07-091-1/+1
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-3010-20/+260
|\ \ | |/
| * Doc: Added an overview page and updated the qdocconfVenugopal Shivashankar2015-06-244-6/+118
| * Doc: Add documentation on how to test with Autobahn|TestsuiteLiang Qi2015-06-032-2/+21
| * QWebSocketServer: handle new connection after invalid oneLiang Qi2015-05-291-7/+9
| * Update plugins.qmltypes for QtWebSockets and Qt.WebSocketsLiang Qi2015-05-263-3/+101
| * Correct the default port of secure hand shake requestLiang Qi2015-05-221-1/+5
| * Doc: Document the changes to the QML import statementSze Howe Koh2015-05-221-0/+5
| * Fix qmldir for qmlwebsockets_compatLiang Qi2015-05-221-1/+1
* | Send and parse headers for the handshake requestLuca Niccoli2015-05-263-3/+25
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-05-113-4/+19
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1Liang Qi2015-04-152-0/+13
| |\
| | * Fixed a crash when destroying the QWebSocketServerv5.4.25.4.2Kimmo Karvinen2015-04-082-0/+13
| * | Fix copy constructorLuca Niccoli2015-04-091-1/+1
| * | Do not decode the HTTP resource nameLuca Niccoli2015-04-091-2/+3
| * | Always initialize m_handshakeStateLuca Niccoli2015-04-081-1/+2
* | | Add open(const QNetworkRequest &) and request()Luca Niccoli2015-04-084-19/+47
|/ /
* | Fix two gcc warningsv5.5.0-alpha1Allan Sandfeld Jensen2015-02-261-2/+2
* | Doc: Added introductory text about WebSocketVenugopal Shivashankar2015-02-252-6/+12
* | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-252-3/+8
|\ \ | |/
| * client ping should be maskedLiang Qi2015-02-241-1/+6
| * Fix the build for WinRT/ARMLiang Qi2015-02-231-2/+2
* | Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Frederik Gladhorn2015-02-242-4/+20
|\ \
| * \ 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
|/ /