summaryrefslogtreecommitdiff
path: root/tests/auto/websockets/qwebsocket
Commit message (Expand)AuthorAgeFilesLines
* Updated license headersAntti Kokko2016-01-201-17/+12
* Test: replace obsolete QUrl::addQueryItem()Liang Qi2015-10-211-1/+3
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-201-0/+103
|\
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-201-1/+1
| |\
| | * Test: stablize tst_QWebSocket::tst_moveToThread()5.5Liang Qi2015-10-201-1/+1
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-021-0/+103
| |\ \ | | |/
| | * Set parent of internal socket objectsPeter Kümmel2015-09-041-0/+103
* | | Tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0.Friedemann Kleint2015-08-312-4/+6
|/ /
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-301-12/+34
|/
* tests: move all auto tests to websockets sub directoryLiang Qi2015-05-222-0/+618