summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * Add warning to example regarding ignoring ssl errorsKurt Pattyn2014-03-121-0/+5
| * Fix unit testsKurt Pattyn2014-03-121-1/+1
| * Fix for self-signed certificatesKurt Pattyn2014-03-122-4/+17
| * Return correct error string for known socket errorsKurt Pattyn2014-03-122-7/+37
| * Update documentation.Kurt Pattyn2014-03-114-0/+87
| * Doc: Review documentation Qt WebSocketsNico Vertriest2014-03-119-8/+31
| * Fix documentation warningsKurt Pattyn2014-03-111-2/+5
| * Fix Google Chrome connection problemKurt Pattyn2014-03-102-4/+21
| * Make the constructor explicitSergio Ahumada2014-03-011-1/+1
| * Use const & for your foreach variablesSergio Ahumada2014-03-012-2/+2
| * Prefer to use normalised signal/slot signaturesSergio Ahumada2014-03-011-4/+4
| * Add .tag file and the git-archive export optionsSergio Ahumada2014-03-012-0/+5
| * Doc: Fixed missing line separators in qdocconf file.v5.3.0-alpha1Jerome Pasion2014-02-241-2/+2
* | Cleanup header fileKurt Pattyn2014-03-121-2/+0
* | Cleanup headerKurt Pattyn2014-03-111-4/+0
|/
* Remove superfluous setProtocol callKurt Pattyn2014-02-161-1/+0
* Catch SSL errors in exampleKurt Pattyn2014-02-162-0/+9
* Mark html page as being utf-8Kurt Pattyn2014-02-161-0/+2
* Fix non-strict warning from AutoBahnKurt Pattyn2014-02-161-2/+0
* Rename websockets.pro -> qtwebsockets.proSergio Ahumada2014-02-167-13/+28
* Adapt copyright headerKurt Pattyn2014-02-1560-60/+60
* Add user configurable mask generationKurt Pattyn2014-02-1512-22/+553
* Fix multiple emission of received signalsKurt Pattyn2014-02-152-1/+217