summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | Bump versionOswald Buddenhagen2017-01-031-1/+1
| * | Fixed wrong scheme for secure websocketAleksey Lysenko2016-12-166-1/+110
| * | Fixed QWebSocketServer::SslMode collisionAleksey Lysenko2016-12-141-2/+2
| * | Delete disconnected socketAleksey Lysenko2016-12-132-3/+5
| * | Fixed WebSocket status docAleksey Lysenko2016-12-131-5/+5
| |/
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-265-6/+10118
| |\
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-5/+0
| | |\
| | | * remove dependencies from sync.profileOswald Buddenhagen2016-11-061-5/+0
| | * | Binary compatibility file for QtWebSockets (5.7)v5.7.15.7.1Milla Pohjanheimo2016-10-041-0/+5096
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-012-0/+5021
| | |\ \ | | | |/
| | | * Added binary compatibility data files to QtWebSockets for Qt 5.6Milla Pohjanheimo2016-09-302-0/+5021
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-171-1/+1
| | |\ \ | | | |/
| | | * Doc: Add verb to WebSockets introv5.6.25.6.2Kai Koehne2016-08-121-1/+1
* | | | Remove support for WinRT 8.1 and Windows Phone 8.1Maurice Kalinowski2017-01-191-2/+2
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-217-17/+13
|\ \ \ \ | |/ / /
| * | | Make sure we find the ssl feature from QtNetworkv5.8.0-beta1Lars Knoll2016-09-141-0/+1
| * | | Eradicate Q_FOREACH and Java-style loops and mark the module as Q_FOREACH-freeMarc Mutz2016-09-076-18/+14
| * | | Fix loading of QML pluginsv5.8.0-alpha1Simon Hausmann2016-08-291-1/+1
* | | | Bump versionOswald Buddenhagen2016-08-291-1/+1
* | | | Eradicate Q_FOREACH loopsAndré Klitzing2016-08-232-2/+3
|/ / /
* | | Clean up QT_CONFIG usageLars Knoll2016-08-199-9/+9
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-026-8/+51
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-015-8/+14
| |\ \ | | |/
| | * Fixed erroneous detection of server disconnect conditionOleksandr Tymoshenko2016-06-201-1/+1
| | * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-163-3/+3
| | * Doc: Also mention QML Import in index pageKai Koehne2016-05-231-4/+10
| * | Bump versionOswald Buddenhagen2016-07-281-1/+1
| * | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-0/+37
| |\ \
| | * | Mention license change in 5.7.0 changelog.v5.7.05.7.0Jani Heikkinen2016-06-081-0/+37
| |/ /
* | | Add support for TLS PSK (client and server)André Klitzing2016-06-129-0/+182
* | | Doc: Update WebSockets import to 1.1Kai Koehne2016-05-261-2/+2
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-249-5/+25
|\ \ \ | |/ /
| * | 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.7' into devLiang Qi2016-04-0818-56/+204
|\ \ \ | |/ /
| * | 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
* | | | Remove unused variableFrank Meerkoetter2016-04-071-3/+1
* | | | Limit variable scopeFrank Meerkoetter2016-04-071-2/+1