summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Doc: Remove repository name from examplesinstallpathv5.6.1-1v5.6.15.6.1Topi Reinio2016-05-121-1/+1
* Fix possible hang on handshakeKai Koehne2016-04-071-2/+5
* Doc: Avoid auto-linking of WebSocket, WebSocketsKai Koehne2016-04-073-3/+23
* Doc: Add external-resources.qdocKai Koehne2016-04-0711-38/+136
* Merge remote-tracking branch 'origin/5.6.0' into 5.6Frederik Gladhorn2016-03-171-10/+9
|\
| * Doc: Remove reference to Qt Cloud servicev5.6.0-rc1v5.6.05.6.0Venugopal Shivashankar2016-02-151-10/+9
* | Update the QWebSocket's QSslConfiguration when neededAndy Shaw2016-03-102-0/+20
* | Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-033-3/+3
|/
* Fix typos in translated messages.v5.6.0-beta1Friedemann Kleint2015-10-221-2/+2
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-201-1/+1
|\
| * Include QtCore/ in path for #include of QObject.Edward Welbourne2015-10-161-1/+1
* | Update plugins.qmltypesKai Koehne2015-10-152-4/+4
* | Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-151-1/+1
* | Update plugins.qmltypesNobuaki Sukegawa2015-10-131-2/+2
* | Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-053-0/+33
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-026-28/+86
|\ \ | |/
| * Fix DoS vulnerabilityv5.5.15.5.1Kurt Pattyn2015-09-063-9/+57
| * Set parent of internal socket objectsPeter Kümmel2015-09-043-19/+29
* | rsv1-3 should be bool instead of intLiang Qi2015-09-142-47/+22
* | Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1Liang Qi2015-08-211-1/+5
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-08-191-1/+5
| |\
| | * Doc: Updated the list of examples that need generic thumbnail image5.4Venugopal Shivashankar2015-05-291-1/+5
* | | 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