summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Doc: Remove repository name from examplesinstallpathv5.6.1-1v5.6.15.6.1Topi Reinio2016-05-121-1/+1
* do not enable example installs explicitly any moreOswald Buddenhagen2016-05-061-1/+0
* add example installsOswald Buddenhagen2016-05-067-3/+24
* 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
* | Bump versionOswald Buddenhagen2016-02-081-1/+1
|/
* Fix typos in translated messages.v5.6.0-beta1Friedemann Kleint2015-10-221-2/+2
* Test: replace obsolete QChar::fromAscii()Liang Qi2015-10-201-2/+2
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-202-2/+2
|\
| * Test: stablize tst_QWebSocket::tst_moveToThread()5.5Liang 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-029-33/+262
|\ \ | |/
| * Fix DoS vulnerabilityv5.5.15.5.1Kurt Pattyn2015-09-065-14/+130
| * Set parent of internal socket objectsPeter Kümmel2015-09-044-19/+132
* | rsv1-3 should be bool instead of intLiang Qi2015-09-143-63/+38
* | Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1Liang Qi2015-08-213-1/+693
|\ \ | |/
| * 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
| | * Bump versionOswald Buddenhagen2015-04-201-1/+1
| * | Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
* | | 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
|\ \ \ | |/ /