summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* CMake: Regenerate projects after mergewip/cmakeAlexandru Croitor2020-03-233-8/+4
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-2315-208/+200
|\
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-072-8/+6
| |\
| | * Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-03-022-8/+6
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-294-10/+11
| |\ \ | | |/
| | * Revert "QWebSocket - do not use deprecated member-function"Allan Sandfeld Jensen2020-02-271-1/+1
| | * WebSocketServer: Add Q_(UN)LIKELYAndre Hartmann2020-02-261-6/+6
| | * Update plugins.qmltypes for 5.15Jani Heikkinen2020-02-251-1/+1
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-251-2/+3
| | |\
| | | * Doc: fix missing closing commentAndre Hartmann2020-02-241-0/+1
| | | * Doc: fix links to autobahn testsuiteAndre Hartmann2020-02-241-2/+2
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-284-6/+6
| |\ \ \ | | |/ /
| | * | Change QMap to QMultiMapMårten Nordheim2020-01-234-6/+6
| * | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2020-01-211-1/+1
| |\ \ \ | | |/ /
| | * | QWebSocket - do not use deprecated member-functionTimur Pocheptsov2020-01-151-1/+1
| * | | Use the new functions/signals introduced in QSslSocketLars Schmertmann2020-01-218-0/+122
| |/ /
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-142-7/+2
| |\ \ | | |/
| | * Remove extra deleteLater (already done in onSocketDisconnected)Franck Dude2019-12-131-1/+0
| | * Don't add port in Host header unless specifiedLander Noterman2019-11-211-6/+2
| * | Add protection against handshake header too largeFranck Dude2019-12-131-1/+9
| * | Fix websocket handshake request header parsingFranck Dude2019-12-133-8/+33
| * | Cleanup QWebSocketFrameChristian Ehrlicher2019-11-262-147/+15
| |/
| * Doc: Remove broken documentation commentsTopi Reinio2019-11-111-25/+0
| * Update plugins.qmltypes for 5.14Kai Koehne2019-10-221-1/+1
* | Regenerate projectsAlexandru Croitor2019-11-153-9/+6
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-1511-212/+295
|\ \ | |/
| * Add support for chrono versions of handshakeTimeout functionsv5.14.0-beta2Mårten Nordheim2019-10-092-4/+34
| * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-171-4/+12
| |\
| | * wasm: make sendBinaryMessage work in threaded modeMorten Johan Sørvig2019-09-131-4/+12
| * | Add missing \since 5.14 to new APIMårten Nordheim2019-08-301-0/+2
| * | Take 2: Properly handle multiple websocket frames in one TCP frameMårten Nordheim2019-08-281-1/+1
| * | QWebsocket doesn't receive message with size larger than 1MRyan Chu2019-08-283-9/+13
| * | Merge dev into 5.14Kari Oikarinen2019-08-275-192/+225
| |\ \
| | * | Remove waitForReadyRead from QWebSocketFrame::readFrameRyan Chu2019-08-235-36/+56
| | * | Make QWebSocketFrame::readFrame as a non-static public functionRyan Chu2019-08-234-21/+20
| | * | Add an internal state to keep the processing state of frame readingRyan Chu2019-08-232-52/+41
| | * | Divide QWebSocketFrame::readFrame into subroutinesRyan Chu2019-08-232-142/+167
| * | | Use QElapsedTimer instead of QTime for the ping timerFriedemann Kleint2019-08-232-2/+4
| * | | Prospective fix for compilation with WebAssembly/MinGW73Friedemann Kleint2019-08-221-3/+6
| |/ /
| * | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-161-0/+1
| |\ \ | | |/
| | * Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
* | | Regenerate before mergeAlexandru Croitor2019-10-153-1/+3
* | | Fix the cmake configuration stepSimon Hausmann2019-09-193-2/+33
* | | Add initial-support for cmakeMaurice Kalinowski2019-09-164-0/+90
|/ /
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-291-3/+5
|\ \ | |/
| * Doc: Complete parameter description several methodsNico Vertriest2019-06-181-3/+5
* | Fix deprecation warnings in QWebSocketHandshakeResponse::getHandshakeResponse()Friedemann Kleint2019-05-271-6/+18
* | websocket server: add timeout to abort incomplete handshakesHeiko Voigt2019-04-296-5/+99
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-135-9/+12
|\ \ | |/
| * Automatically register the latest import versionv5.13.0-beta3Kai Koehne2019-04-125-9/+12
View Lorry Controller Status