summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | 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
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-098-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-112-3/+6
|/ / /
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-09-192-14/+14
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-160-0/+0
| |\ \ | | |/
| | * Bump versionFrederik Gladhorn2014-08-291-1/+1
| * | Fix QWebSocketServer for clients preferring lowercase http headers.Jorma Tähtinen2014-09-092-14/+14
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-08-2876-1304/+1718
|\ \ \ | |/ /
| * | Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-2475-1303/+1706
| * | 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
* | | Bump versionOswald Buddenhagen2014-08-091-1/+1
|/ /
* | remove some pointless noise from project filesOswald Buddenhagen2014-08-083-11/+1