summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.3' into 5.4.0v5.4.0-rc1v5.4.05.4.0Oswald Buddenhagen2014-11-105-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
* | Also forward the bytesWritten(qint64) signalPeter Kümmel2014-10-151-0/+1
* | Update the plugins.qmltypes meta data.Milian Wolff2014-10-141-0/+50
* | Improve the integration of QtWebsockets into general Qt docsv5.4.0-beta1Alex Blasche2014-09-288-3/+11
* | 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
* | 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
* | 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
| * Use the proper protocol namesSze Howe Koh2014-04-0918-63/+63
| * Fix compilation on QNXSergio Ahumada2014-04-041-2/+2
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-2447-52/+49
|\ \ | |/
| * Doc: Fix example path in documentation configv5.3.0-beta1Topi Reinio2014-03-211-1/+1
| * Move examples into 'websockets' folderKai Koehne2014-03-1938-10/+13
| * Doc: small fix in documentationKurt Pattyn2014-03-191-1/+1
| * fix compilation with QT_NO_NETWORKPROXYMaurice Kalinowski2014-03-182-1/+5
| * fix typo in macroMaurice Kalinowski2014-03-172-2/+2
| * Doc: Language/writ. guidelines review Qt WebSocketsNico Vertriest2014-03-145-27/+24
| * Doc: Add generic thumbnails for the examplesTopi Reinio2014-03-141-0/+2
| * Doc: Move and edit examples pageTopi Reinio2014-03-141-11/+2
* | Remove unused variableKurt Pattyn2014-03-181-1/+0
* | Bump module version to 5.4.0Sergio Ahumada2014-03-131-1/+1
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-03-1326-33/+216
|\ \ | |/