summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-199-5/+25
|\
| * Bump versionOswald Buddenhagen2016-05-191-1/+1
| * 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
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0814-53/+193
|\ \ | |/
| * 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
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-073-3/+3
|\ \ \ | |/ /
| * | Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-033-3/+3
* | | Enable using the module in a statically built applicationv5.7.0-alpha1Andy Shaw2016-02-261-0/+8
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-151-2/+2
|\ \ \ | |/ /
| * | Bump versionOswald Buddenhagen2016-02-081-1/+1
| |/
| * Fix typos in translated messages.v5.6.0-beta1Friedemann Kleint2015-10-221-2/+2
* | Updated license headersAntti Kokko2016-01-2027-470/+929
* | Updated license headersAntti Kokko2016-01-2016-255/+884
* | Updated license headersAntti Kokko2016-01-2038-490/+1878
* | Add QML test casesNobuaki Sukegawa2015-12-281-4/+44
* | Test: replace obsolete QUrl::addQueryItem()Liang Qi2015-10-211-1/+3
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-2020-105/+1034
|\ \ | |/
| * 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
* | | | Bump versionOswald Buddenhagen2015-09-101-1/+1
* | | | Tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0.Friedemann Kleint2015-08-312-4/+6
* | | | Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.Friedemann Kleint2015-08-319-9/+0
|/ / /
* | | 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
| |\ \