summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 5.5.0 changelogv5.5.0-rc1v5.5.05.5.0Liang Qi2015-06-051-0/+49
* 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
* 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
* | 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
| | * Doc: add description and image for echoclient htmlLiang Qi2015-02-133-1/+12
* | | Update copyright headersJani Heikkinen2015-02-1679-481/+473
|/ /
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-133-22/+21
|\ \ | |/
| * Fix the translation in QWebSocketFrameLiang Qi2015-02-102-13/+16
| * Use old-style SIGNAL and SLOT macros in tst_qwebsocket.cppDmitry Shachnev2015-01-261-9/+5
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-192-0/+7
|\ \ | |/
| * Bump versionOswald Buddenhagen2015-01-161-1/+1
| * QWebSocket should remember close code and reasonv5.4.15.4.1Frederik Gladhorn2014-12-292-0/+7
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-171-0/+2
|\ \ | |/
| * Bump versionOswald Buddenhagen2014-12-121-1/+1
| * 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-217-16/+160
|\ \ | |/
| * Set parent of internal server objectsPeter Kümmel2014-11-182-4/+4
| * Merge remote-tracking branch 'origin/5.3' into 5.4Oswald Buddenhagen2014-11-035-12/+156
| |\
| | * Fix invalid Date header field in handshake response5.3Joni Poikelin2014-11-034-3/+140
| | * Make QWebSocketPrivate::makeConnections() take care of all connections.Christian Kandeler2014-11-031-9/+16
| | * Compile fix without proxy supportMaurice Kalinowski2014-11-031-0/+4