summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump versionOswald Buddenhagen2015-09-101-1/+1
* Tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0.Friedemann Kleint2015-08-312-4/+6
* Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.Friedemann Kleint2015-08-319-9/+0
* Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-093-8/+15
|\
| * WebSocketServer: use int type for portLiang Qi2015-07-223-8/+15
* | 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-3042-36/+584
|\ \ | |/
| * Bump versionOswald Buddenhagen2015-06-291-1/+1
| * Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-261-0/+49
| |\
| | * 5.5.0 changelogv5.5.0-rc1v5.5.05.5.0Liang Qi2015-06-051-0/+49
| * | 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-033-2/+79
| |/
| * 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
| * tests: enable cmake in auto testsLiang Qi2015-05-221-1/+1
| * 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-2212-4/+202
| * tests: move all auto tests to websockets sub directoryLiang Qi2015-05-2220-14/+17
* | Fix incorrectly encoded data tagSimon Hausmann2015-06-271-1/+1
* | Add missing check for socket connection in testFrederik Gladhorn2015-06-111-0/+1
* | Fix flaky test: QTRY_COMPARE instead of qWaitFrederik Gladhorn2015-06-101-15/+6
* | Send and parse headers for the handshake requestLuca Niccoli2015-05-264-4/+34
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-05-117-8/+70
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1Liang Qi2015-04-153-0/+47
| |\
| | * Fixed a crash when destroying the QWebSocketServerv5.4.25.4.2Kimmo Karvinen2015-04-083-0/+47
| * | Fix copy constructorLuca Niccoli2015-04-091-1/+1
| * | Do not decode the HTTP resource nameLuca Niccoli2015-04-092-3/+15
| * | Fix urls in client compliance testLuca Niccoli2015-04-091-2/+2
| * | Always initialize m_handshakeStateLuca Niccoli2015-04-082-1/+4
| * | Readme: Refer to code.qt.io, not gitoriousTobias Hunger2015-03-241-1/+1
* | | Add open(const QNetworkRequest &) and request()Luca Niccoli2015-04-085-19/+69
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-03-1723-831/+162
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-03-173-2/+10
| |\ \ | | |/
| | * Examples: fix certificate files for shadow build in sslechoserverLiang Qi2015-03-093-2/+10
| * | Enable websocket tests on WindowsLuca Niccoli2015-03-131-8/+2
| * | Fix two gcc warningsv5.5.0-alpha1Allan Sandfeld Jensen2015-02-261-2/+2
| * | Corrected license files & licensing informationJani Heikkinen2015-02-254-795/+23
| * | Doc: Added introductory text about WebSocketVenugopal Shivashankar2015-02-252-6/+12
| * | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-255-9/+40
| |\ \ | | |/
| | * client ping should be maskedLiang Qi2015-02-241-1/+6
| | * Fix the build for WinRT/ARMLiang Qi2015-02-231-2/+2
| | * Example: echoserver should not close when it got a new connectionLiang Qi2015-02-201-1/+0
| | * Examples: add options for port and debug outputs in echoserverLiang Qi2015-02-203-5/+32
| * | Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Frederik Gladhorn2015-02-248-11/+75
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-208-11/+75
| | |\ \ | | | |/
| | | * fix the port in Host field in handshake requestLiang Qi2015-02-202-2/+36
| | | * Fix keyword for OriginLiang Qi2015-02-171-1/+1
| | | * Examples: add an option for debug outputs in echoclientLiang Qi2015-02-173-6/+25
| | | * Doc: added qmake to dependenciesNico Vertriest2015-02-161-1/+1