summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2Liang Qi2017-10-114-11/+54
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4af142703e469b56236b73335a93f6960534c0f1
| * Replace iterator based loop by range-for-loopAndré Klitzing2017-10-101-9/+9
| | | | | | | | | | | | | | | | Found by clazy and fixes "clazy-strict-iterators" warning. Change-Id: I8f50c92ac054d627499440d593faa43ed5b4ad4b Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | Change-Id: Ic2a08fd6c43078bf571e37234a52234827537394
| * Add changes file for Qt 5.9.2v5.9.25.9.2Liang Qi2017-09-281-0/+18
| | | | | | | | | | Change-Id: Ic2c1569e84296a4cc2c64e5861fac0a7e4176887 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Change assert to null-checkMårten Nordheim2017-09-201-1/+2
| | | | | | | | | | | | | | | | | | Avoids a crash that would happen if readyRead was emitted after calling ::close on the websocket. Task-number: QTBUG-59179 Change-Id: I1e7bd19d99ee068b8699014fac9a72f839632c85 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * Add change file for Qt 5.6.3Liang Qi2017-09-011-0/+24
| | | | | | | | | | | | Task-number: QTBUG-62724 Change-Id: I944d2a3e296d170913793a3b7185306ec24dac18 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Fix releaseConnectionsAlan Alpert2017-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The overload selected when you pass a single object pointer is to disconnect all signals with that object as a receiver. We want to disconnect all signals with that object as a sender, which is done most easily by passing no explicit arguments. Task-number: QTBUG-62667 Change-Id: I3dd9c5aced9160510bff527355ecfbedded690aa Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Romain Pokrzywka <romain.pokrzywka@gmail.com> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Replace Q_ENUMS by Q_ENUMAndré Klitzing2017-10-102-3/+2
| | | | | | | | | | Change-Id: Ie16c88fb0a215efe5f152ea2d12c984f8d9e0878 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Use multi-arg instead of multiple arg callsAndré Klitzing2017-10-091-1/+1
| | | | | | | | | | | | Change-Id: Ic1f4b357138457eb33ac9154a280f499664c3c78 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Revamp WebSocket's simple-chat examplev5.10.0-beta1Mårten Nordheim2017-09-284-23/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | - Replace Q_* macros with their 'modern' substitutes - Replace a usage of qDebug with QTextStream - Print a little piece of text whenever a client connects - Add a textbox to the html page to set the host to connect to - Enable/disable disconnect and send button based on connection Task-number: QTBUG-60656 Change-Id: Ieec571c3964f94cd464912054acda3208c02c898 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-alpha1Liang Qi2017-08-153-11/+5175
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3dd9c568ed9160510bff527355ecfbed5d4690a9
| * Remove workaround for unsupported compilerJake Petroules2017-08-141-11/+0
| | | | | | | | | | | | | | | | | | Qt for WinRT now requires Visual Studio 2015. Change-Id: I8996f2855476315819532df89c6754aa162bd02e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-0/+24
| |\ | | | | | | | | | Change-Id: Icd6d3b26e51eab31b0b708411570cfc6f6099e3e
| | * Add changes file for 5.9.1v5.9.15.9.1Jani Heikkinen2017-06-231-0/+24
| | | | | | | | | | | | | | | Change-Id: Ifb831b8d4d9edbf73fa3021dacc429368e92f32b Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | | | | | Change-Id: I1439731a3a2b4cd74ca7d5bec958e0181e902d40
| * | Update binary compatibility file for Qt 5.9.0 for QtWebSocketsMilla Pohjanheimo2017-06-301-0/+5151
| |/ | | | | | | | | | | | | Binary compatibility file updated for Qt 5.9.0. Change-Id: I58561a76c8f9d3353d9cf352dd39734044c3e8e2 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Enable tests for boot2qtSami Nurmenniemi2017-07-194-7/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | Websocket tests for boot2qt were disabled with commit 1a75da8d514c90cf1af250ba3eaa764df4838775. The tests can be enabled since qtdeclarative now fallbacks to software renderer if OpenGL is not supported. Qemu still has missing syscall support so some tests need to be skipped if that condition is detected. Change-Id: I39dba91cb35cc17a9a9263c90a739cbf95efa582 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Change the mask generator to use QRandomGenerator instead of qs?randThiago Macieira2017-06-303-12/+12
| | | | | | | | | | | | | | | | | | This makes it secure, instead of insecure, and requires no seeding. Task-number: QTBUG-61694 Change-Id: Ia53158e207a94bf49489fffd14c782bd4ec24946 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-0715-1414/+5225
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib89576c203259364795a3b1caf0717fb28126629
| * Explain how to run the manual testJesus Fernandez2017-05-311-0/+6
| | | | | | | | | | | | | | | | Adds a comment about the preconditions to execute the test. Change-Id: Iafb56ec18520e02681cce73e406f0e9744662a77 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+39
| |\ | | | | | | | | | Change-Id: Ic9a7d0f871c1533705f5567a665607403cb983ee
| | * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.05.9.0Jani Heikkinen2017-05-151-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: Ie2dec2173c298a41d15ad8546ae81eebb0aeea05 Reviewed-by: Fredrik de Vibe <fredrik.devibe@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Bump versionOswald Buddenhagen2017-05-101-1/+1
| | | | | | | | | | | | Change-Id: Ifbc25b9d86d1b7597e026ed22fdb8231d64d0eb5
| * | Disable/blacklist failing tests for boot2qtSami Nurmenniemi2017-05-092-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently boot2qt is tested with QEMU and some tests fail. Disabling them for now to make it possible to enable qt5 tests for Coin. Task-number: QTBUG-60266 Change-Id: Ib93153c857c1645c189db1bd69951cc29acfdccf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Fix licensingJani Heikkinen2017-05-054-1397/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove old, unnecessary license files Task-number: QTBUG-57147 Change-Id: I778fe2a45983f28413a41480d2f72e04fb228820 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Replace comment with Q_FALLTHROUGHJesus Fernandez2017-05-041-3/+3
| | | | | | | | | | | | | | | Change-Id: Ie970ce470672f1c849470b0eaf7fe39758341e37 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | QQmlWebSocket::setUrl(): let open() decided what to actually doEdward Welbourne2017-05-041-3/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After emitting urlChanged(), setUrl() did a manual open(url) if it had a web-socket to do it on, omitting various checks that open() imposes on actually calling open(url); as a result, it left the web socket in an inconsistent state if it wasn't yet active. This meant that setting active could trigger a second open() while the web-socket was already open(), which upset it. Replaced the hand-rolled call to open(url) with a call to open() so as to be consistent and avoid such problems. Task-number: QTBUG-58278 Change-Id: Iee84f2b0d973e7fd288a14018039a665658c0040 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * Fix QtWebSockets manual test buildv5.9.0-beta4Jesus Fernandez2017-05-031-1/+1
| | | | | | | | | | | | | | | | Call public QWebSocket::open(const QUrl &) instead of QWebSocketPrivate::open(const QUrl &, bool). Change-Id: Iab248745f37787d7e3df3d6fd668fc60ad10d220 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Move Q_REQUIRED_RESULT to the beginning of the declarationThiago Macieira2017-04-271-7/+8
| | | | | | | | | | | | | | That's the correct place and works with C++11 attributes. Change-Id: I7814054a102a407d876ffffd14b6a2fed3744b03 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * Fix build for -no-feature-textcodecStephan Binner2017-04-271-2/+4
| | | | | | | | | | | | Change-Id: I98ef516031e8057456d8dab6de01576d2734d8f5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3v5.9.0-beta2v5.9.0-beta1Liang Qi2017-03-103-1/+5153
| |\ | | | | | | | | | Change-Id: Idcd43fba828b00cef553c3142462a4776aeeda8d
| | * Exclude console application tests on UIKit platforms5.8Jake Petroules2017-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Those platforms do not support console applications with the public SDK. Change-Id: I8993882c04c5a4b539f297d13ae09ce9ae8e9463 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Aleksey Lysenko <lysenkoalexmail@gmail.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * Binary compatibility file for qtwebsockets (5.8.0)Milla Pohjanheimo2017-02-031-0/+5131
| | | | | | | | | | | | | | | | | | | | | Added binary compatibility file for qtwebsockets Change-Id: Ia5c70c8f15fba7bd09c40d2bafe95802cb52a6c7 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| | * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-261-0/+21
| | |\ | | | | | | | | | | | | Change-Id: I329897d416849db4bf230068003d4c36e77981c8
| | | * Add changes file for 5.8.0v5.8.0-rc1v5.8.05.8.0Jani Heikkinen2016-12-151-0/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: I976ef33543f560891837c6a59b9ef3e33021c1f6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Force QWebSocketProtocol header file creationv5.9.0-alpha1Timur Pocheptsov2017-02-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qwebsocketprotocol.h header does not declare any class, but only a namespace. This patch updates sync.profile by declaring 'classnames' with QWebSocketProtocol explicitly. Task-number: QTBUG-58651 Change-Id: I759b34c227b3d6ca970bcff08c6fdcbafb958c9e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | | Bump versionOswald Buddenhagen2017-02-021-1/+1
|/ / / | | | | | | | | | Change-Id: I878c1b1ab86938241f45c228b1b1a27a09ffd5ae
* | | Add a function to hand off a tcp socket to the websocket serverAleksey Lysenko2017-01-275-11/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method allows a listening port to process connections with different protocols. It lets the websocket server handle a TCP socket, upgrading it to a websocket [ChangeLog][QWebSocketServer] Add support to handle external QTcpSocket Done-with: André Klitzing <aklitzing@gmail.com> Task-number: QTBUG-54276 Change-Id: Ia36b481dc87d6f3806e9f1e61e75e528640f1937 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-2518-40/+10404
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If50b73b1f1e293269404bd8b38088119a0f59f1f
| * | Fix the parser of port in hand shake requestLiang Qi2017-01-062-10/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QUrl::setAuthority() to parse host and port. The request is invalid when having username or password in Host. Task-number: QTBUG-57357 Change-Id: I4e7c0370794dce15359d372a1e36dc0383083204 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Fixed possible block clearing in QWebSocketDataProcessor::process methodAleksey Lysenko2017-01-042-13/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QWebSocketDataProcessor::process() the signals text(binary)MessageReceived are emitted before clear() method. If signal handler blocks loop (for example, using QDialog::exec()), clear() will be called only after resuming loop. It may lead to the data corruption due to the fact that QWebSocketDataProcessor clearing won't be performed before the new data arrived. Task-number: QTBUG-55506 Change-Id: Ib7016a91d3987dec7c1af977b17f86a53568c413 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | | | | | Change-Id: Ia8d1d059f2b8af4ec04e9abe8baa8ad150784e41
| * | Fixed wrong scheme for secure websocketAleksey Lysenko2016-12-166-1/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Websocket server always constructed QWebSocketHandshakeRequest like for non-secure socket without checking SecureMode. This led to the fact that secure socket had "ws" scheme. Task-number: QTBUG-55927 Change-Id: I881766f55182136072fd23f3fefe93ea60f3d27d Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | Fixed QWebSocketServer::SslMode collisionAleksey Lysenko2016-12-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Value of NonSecureMode enumerator depends on QT_NO_SSL. If Qt is built with QT_NO_SSL defined, NonSecureMode is equal to 0, otherwise it is equal to 1. It may lead to problem if user built app with libs where NonSecureMode = 0, but run it with libs where NonSecureMode = 1. [ChangeLog][QWebSocketServer] SslMode::NonSecure enumerator now always has the same value (1) regardless of SSL enabled or disabled. Task-number: QTBUG-56129 Change-Id: If17137eff4b19015697c827a985ef89dd95a5611 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | Delete disconnected socketAleksey Lysenko2016-12-132-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Method onSocketDisconnected has never been called, so WebSocketServer did not handle closed connection properly. Moreover, socket was not freed in time and this led to increase in memory consumption Task-number: QTBUG-56414 Change-Id: Ib57f5b88413ffeef4f296a260245ba0a8d25adb2 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Fixed WebSocket status docAleksey Lysenko2016-12-131-5/+5
| |/ | | | | | | | | | | Task-number: QTBUG-57523 Change-Id: I2c7f6c2467ba615d1bcbb9d659e27bb242373710 Reviewed-by: Martin Smith <martin.smith@qt.io>
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-265-6/+10118
| |\ | | | | | | | | | Change-Id: Ia8c2930d5bf681227cef0730cdf0dca6d068722f
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-5/+0
| | |\ | | | | | | | | | | | | Change-Id: I5e33e714227a277178c5d69c3a06003f58e2050a
| | | * remove dependencies from sync.profileOswald Buddenhagen2016-11-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: I127063ac69995e8084b7fd0caf25f253270b7195 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| | * | Binary compatibility file for QtWebSockets (5.7)v5.7.15.7.1Milla Pohjanheimo2016-10-041-0/+5096
| | | | | | | | | | | | | | | | | | | | | | | | | | | | BC file added for QtWebSockets module Change-Id: I94fdae9d83003ebe17a2799794047ee095880205 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
View Lorry Controller Status