summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-171-0/+2
|\ \ | |/
| * Bump versionOswald Buddenhagen2014-12-121-1/+1
| * Hardcode QtQml version import in .pro fileKai Koehne2014-12-051-0/+2
* | Rename QML import from "Qt.WebSockets" to "QtWebSockets"Sze Howe Koh2014-12-0110-11/+24
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-217-16/+160
|\ \ | |/
| * Set parent of internal server objectsPeter Kümmel2014-11-182-4/+4
| * Merge remote-tracking branch 'origin/5.3' into 5.4Oswald Buddenhagen2014-11-035-12/+156
| |\
| | * Fix invalid Date header field in handshake response5.3Joni Poikelin2014-11-034-3/+140
| | * Make QWebSocketPrivate::makeConnections() take care of all connections.Christian Kandeler2014-11-031-9/+16
| | * Compile fix without proxy supportMaurice Kalinowski2014-11-031-0/+4
* | | Make the websocket handshake statefullAllan Sandfeld Jensen2014-11-192-39/+82
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-202-0/+51
|\ \ \ | |/ /
| * | Also forward the bytesWritten(qint64) signalPeter Kümmel2014-10-151-0/+1
| * | Update the plugins.qmltypes meta data.Milian Wolff2014-10-141-0/+50
* | | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2014-10-138-3/+11
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-098-3/+11
| |\ \ \ | | |/ /
| | * | Improve the integration of QtWebsockets into general Qt docsv5.4.0-beta1Alex Blasche2014-09-288-3/+11
* | | | Fix QWebSocket's handling of query parameters with encoded charactersJuha Turunen2014-10-112-3/+6
|/ / /
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-09-192-14/+14
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-160-0/+0
| |\ \ | | |/
| | * Bump versionFrederik Gladhorn2014-08-291-1/+1
| * | Fix QWebSocketServer for clients preferring lowercase http headers.Jorma Tähtinen2014-09-092-14/+14
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-08-2876-1304/+1718
|\ \ \ | |/ /
| * | Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-2475-1303/+1706
| * | Fix build with non-OpenSSL SSL-enabled backendsAndrew Knight2014-08-131-1/+1
| * | WinRT: Fix compiler crash (msvc2013 arm)Maurice Kalinowski2014-08-131-0/+11
* | | Bump versionOswald Buddenhagen2014-08-091-1/+1
|/ /
* | remove some pointless noise from project filesOswald Buddenhagen2014-08-083-11/+1
* | remove custom module pri fileOswald Buddenhagen2014-08-082-12/+0
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-144-5/+5
|\ \ | |/
| * Use 0 instead of Q_NULLPTR in public headers.v5.3.25.3.2Sergio Martins2014-07-114-4/+4
* | Compile fix without proxy supportMaurice Kalinowski2014-07-071-0/+4
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
* | Add initial support for a declarative WebSocketServer.Milian Wolff2014-07-0213-11/+658
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-262-1/+19
|\ \ | |/
| * Fix a typo in proxy handling.Jędrzej Nowacki2014-06-252-1/+19
| * Bump versionOswald Buddenhagen2014-06-181-1/+1
* | Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-144-2/+8
|\ \ | |/
| * Bump MODULE_VERSION to 5.3.1v5.3.1stable5.3.1Sergio Ahumada2014-05-261-1/+1
| * Document WebSocket::sendTextMessage(string message)Richard Moe Gustavsen2014-05-231-0/+5
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-143-2/+3
| |\
| | * Add missing classname for module in qmldir.v5.3.0Frederik Gladhorn2014-05-093-2/+3
| |/
* | Doc: Fix qmlclass selector used in documentation configTopi Reinio2014-06-111-1/+1
* | Add a QUrl serverUrl method to QWebSocketServer.Milian Wolff2014-06-083-8/+47
* | Remove dependency on unused sql moduleFatih Aşıcı2014-05-271-1/+1
* | Copy the more efficient HTTP header parser from QtNetworkThiago Macieira2014-05-091-21/+46
* | Remove superfluous qWarning statementsKurt Pattyn2014-05-051-5/+0
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-1119-73/+73
|\ \ | |/
| * Use correct casing for WebSocketv5.3.0-rc1Kurt Pattyn2014-04-101-1/+1
| * Fix process handshake for servers preferring lowercase http headers.Jędrzej Nowacki2014-04-091-7/+7