summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Remove repository name from examplesinstallpathv5.6.1-1v5.6.15.6.1Topi Reinio2016-05-121-1/+1
| | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Id4e9b2bc738ae3b1b35114c74530aa50e4103aa3 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Fix possible hang on handshakeKai Koehne2016-04-071-2/+5
| | | | | | | | | processHandShake operates on complete lines. If the data available does not contain the full handshake message, the loop will therefore never return. Task-number: QTBUG-51001 Change-Id: Ie87f5b5dee01116f463e84f06feab502ff5ac563 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: Avoid auto-linking of WebSocket, WebSocketsKai Koehne2016-04-073-3/+23
| | | | | | | | | | | | Disable the automatic linking of 'WebSocket' to the QML type, and 'WebSockets' to a section in the general documentation. Instead, make the linking explicit where it makes sense. This patch is inspired by 0228a5bd581ae6d672ce5f3 in qtwebengine. Change-Id: I80886360d5f7fdaa68a5e5f6fa982137c7187719 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Doc: Add external-resources.qdocKai Koehne2016-04-0711-38/+136
| | | | | | | | | Also sanitize some linking, e.g. by referencing to the paper by title, not by link. Change-Id: I95482994ca569001a23a3beb0e3cbe6739f4ed77 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6.0' into 5.6Frederik Gladhorn2016-03-171-10/+9
|\ | | | | | | Change-Id: I11c3b9f39d56d3b26e0f3c4012cb2e3afee46341
| * Doc: Remove reference to Qt Cloud servicev5.6.0-rc1v5.6.05.6.0Venugopal Shivashankar2016-02-151-10/+9
| | | | | | | | | | | | Task-number: QTBUG-51087 Change-Id: I98190d1981c864ee3fc5dc6d7e5375527536adfd Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Update the QWebSocket's QSslConfiguration when neededAndy Shaw2016-03-102-0/+20
| | | | | | | | | | | | | | | | This ensures that the peer certificate chain is kept in sync so that it can be queried when an encrypted connection has been made. Change-Id: I5df18bb71ac4bec3a8a939482df5a5ffe5c20cb5 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-033-3/+3
|/ | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: Id9621ffedaf190f8b97db613a7c6be2a45f117b3 Task-number: QTBUG-45291 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Fix typos in translated messages.v5.6.0-beta1Friedemann Kleint2015-10-221-2/+2
| | | | | | Change-Id: I373d3a174ed5c9d53fddb7254b04628f2ee8526d Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-201-1/+1
|\ | | | | | | Change-Id: I7b56e21fa93d0d196887e8dfa683050f3a032186
| * Include QtCore/ in path for #include of QObject.Edward Welbourne2015-10-161-1/+1
| | | | | | | | | | | | Task-number: QTBUG-48714 Change-Id: I0e9b54b98b561f3d82f542ac5d311ca1aca252eb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Update plugins.qmltypesKai Koehne2015-10-152-4/+4
| | | | | | | | | | | | | | 0610115192f4a1 changed the port type from uint16 to int. Change-Id: I800fe254648d026c8e29d93a2945bdf8380aa950 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: I24d946bad60ef0c9e81517979abfa6e3969df0cb Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Update plugins.qmltypesNobuaki Sukegawa2015-10-131-2/+2
| | | | | | | | | | | | | | | | This follows the port type change in 0610115192f4a1e4d722330bf298ccd213ca3b5f. Change-Id: Icf24665b0e9a604e2919095fc737a1085f430175 Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-053-0/+33
| | | | | | | | | | Change-Id: Icc8c6928619b2e16f5f13e852e559438faf9a03c Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-026-28/+86
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp Change-Id: Ie4184b0788b6a0a5a85ca8e4d1547c33f7027ca0
| * Fix DoS vulnerabilityv5.5.15.5.1Kurt Pattyn2015-09-063-9/+57
| | | | | | | | | | | | | | | | | | Add checks on maximum header line length and on the maximum number of header lines. Task-number: QTBUG-48123 Change-Id: I65dbeb53af7aa0dfa137ce31fc2549940559314e Reviewed-by: Richard J. Moore <rich@kde.org>
| * Set parent of internal socket objectsPeter Kümmel2015-09-043-19/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After moving the websocket into another thread current code doesn't work because then the QTcpSocket/QSslSocket objects reside in a different thread, for instance: "QSocketNotifier: Socket notifiers cannot be enabled or disabled from another thread" QObject::moveToThread(QThread*) also moves QObjects's children, therefore their internal socket objects need to be children of QWebSocket. QWebSocket has ownership of the internal socket, and the smart pointer is not needed any more. Change of cleanup code to prevent crashes with clang/msvc builds: QWebSocketPrivate is a scoped member of QObject (not QWebSocket) and is destroyed after QObject destructor body was executed, and so m_pSocket&co had already been destroyed (being children) when the destructor of QWebSocketPrivate is called via the scoped pointer. Analogous to 64927e04f202d33b9a9a1f94141ef692c0b513ac Change-Id: I1ade6cda3fa793c30332cc5e103025e2dda3c78c Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | rsv1-3 should be bool instead of intLiang Qi2015-09-142-47/+22
| | | | | | | | | | | | | | | | | | And reorded the data members of QWebSocketFrame to save some space. Change-Id: I6fdaf74f344ac84e5a3f19883309455503a7ec4c Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Maks Naumov <maksqwe1@ukr.net> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1Liang Qi2015-08-211-1/+5
|\ \ | |/ | | | | Change-Id: Ica80f965969095793f45e9a5b724335ac0a79040
| * Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-08-191-1/+5
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3f9a7c0afccb925e1b821ca7191dab4e1855cc21
| | * Doc: Updated the list of examples that need generic thumbnail image5.4Venugopal Shivashankar2015-05-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the example documentation has an image so the list must be more specific. Task-number: QTBUG-41996 Change-Id: I785dad33f227a7e51daf61540f402e67b6609cc7 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-092-8/+14
|\ \ \ | |/ / | | | | | | Change-Id: Ia29cf611432e0be43e0eaf04384e48f68c93af3e
| * | WebSocketServer: use int type for portLiang Qi2015-07-222-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML engine doesn't support quint16 as a QML type. Task-number: QTBUG-46790 Change-Id: I5b01dc06a3256dd41affc035fc507082e1935cc8 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Don't pass enum type by-ref in foreachSergio Martins2015-07-091-1/+1
| | | | | | | | | | | | | | | Change-Id: I1d05bcfee5715cd06285252202ac00aaa80825eb Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-3010-20/+260
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/websockets/qwebsocket_p.cpp Change-Id: Ibcc1898263cc8bc80066370f045df6a217e46574
| * | Doc: Added an overview page and updated the qdocconfVenugopal Shivashankar2015-06-244-6/+118
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-41044 Change-Id: I074573e814de63e009744a11054365fb2f25bdb9 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Doc: Add documentation on how to test with Autobahn|TestsuiteLiang Qi2015-06-032-2/+21
| | | | | | | | | | | | | | | | | | Change-Id: Ia18acdc3c54e2bb48209406d2a6f9e156b67324c Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * | QWebSocketServer: handle new connection after invalid oneLiang Qi2015-05-291-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually tested with sslechoserver and sslechoclient in examples, invalid connection from "telnet localhost 1234". Task-number: QTBUG-44866 Change-Id: I19c29c7c5f57eef4f9ae069e105fd1db346fb5c5 Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Update plugins.qmltypes for QtWebSockets and Qt.WebSocketsLiang Qi2015-05-263-3/+101
| | | | | | | | | | | | | | | | | | Change-Id: I7cacbce1625015636e92b2fd5f2ade694a97a5c9 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Correct the default port of secure hand shake requestLiang Qi2015-05-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-46055 Change-Id: Iefdec32f778d39520802eabb25f4db37f80fdf76 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Doc: Document the changes to the QML import statementSze Howe Koh2015-05-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes happened in 759b6b12489b68fcbd755398ff9337acefb035a0 [ChangeLog][QML] The import statement has changed from "import Qt.WebSockets 1.0" to "import QtWebSockets 1.0". The old statement is still supported, but it cannot be mixed with the new statement within the same project. Change-Id: I95d75e4a87133c452d2ea43c42593415de882c9b Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Fix qmldir for qmlwebsockets_compatLiang Qi2015-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | It is not supported to have both "import Qt.WebSockets 1.0" and "import QtWebSockets 1.0" in the same project. Task-number: QTBUG-46205 Change-Id: I71b824b091f4491b8ab5e1eae8290a51159b03e2 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Send and parse headers for the handshake requestLuca Niccoli2015-05-263-3/+25
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-40842 Change-Id: I02787a0e55701966e564a312d51297f4160bd89a Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-05-113-4/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/websockets/qwebsocket_p.cpp Change-Id: Ia6434b282b4a0ee92e2b2a8664389f325bd0fcb0
| * | Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1Liang Qi2015-04-152-0/+13
| |\ \ | | |/ | | | | | | Change-Id: I29f5a2acb7ba0313d9e2ac2c005a988d208b617e
| | * Fixed a crash when destroying the QWebSocketServerv5.4.25.4.2Kimmo Karvinen2015-04-082-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lifetime of incoming QTcpSocket/QSslSocket are managed by the QTcpServer/QSslServer and thus the QWebSocketPrivate should clear the pointer to the socket when the socket is destroyed. Added auto test for the crash. Task-number: QTBUG-45331 Change-Id: I6e30e7cdcca22aa810ccc1a1d4d7d77c7cb2c349 Reviewed-by: Steven Ceuppens <steven.ceuppens@icloud.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Fix copy constructorLuca Niccoli2015-04-091-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I2c27bda6523ff84d9ea9178f1e6728bf4defc511 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Do not decode the HTTP resource nameLuca Niccoli2015-04-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | The resource needs to be sent encoded in the HTTP request. Task-number: QTBUG-44889 Change-Id: I3c6c56f5fea1553f3b5751de7da0cfc76150f4b9 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Always initialize m_handshakeStateLuca Niccoli2015-04-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The client-side constructor was leaving it uninitialized, which would sometimes lead to spurious error signals being emitted. Task-number: QTBUG-44893 Change-Id: I7a17f1a16d9a5fe4218beb6d92993c1889ad836b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Add open(const QNetworkRequest &) and request()Luca Niccoli2015-04-084-19/+47
|/ / | | | | | | | | | | | | | | | | | | | | Request headers are not yet handled, only the QNetworkRequest::url() is taken into consideration. [ChangeLog][QWebSocket] Added open(const QNetworkRequest &) and request() Task-number: QTBUG-40842 Change-Id: Ia2e10f22c79b0a085afb9a2eb8437b7a73d4a045 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Fix two gcc warningsv5.5.0-alpha1Allan Sandfeld Jensen2015-02-261-2/+2
| | | | | | | | | | | | Change-Id: I549eb67109eba2cfb766eec78377d63ecc34d3c8 Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Doc: Added introductory text about WebSocketVenugopal Shivashankar2015-02-252-6/+12
| | | | | | | | | | | | | | | | | | Also removed an unnecessary \annotatedlist entry in the QML module page. Change-Id: I1af566d3cc784766b4df474e2471e0885ab5e471 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-252-3/+8
|\ \ | |/ | | | | Change-Id: I218b5069480f60b88390c8540f01c3dbbee485d0
| * client ping should be maskedLiang Qi2015-02-241-1/+6
| | | | | | | | | | | | | | | | Task-number: QTBUG-42298 Change-Id: I4c01052823ce48b737d30ac2e0ef11836124bc4f Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Neil Williams Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * Fix the build for WinRT/ARMLiang Qi2015-02-231-2/+2
| | | | | | | | | | | | Task-number: QTBUG-44491 Change-Id: Iec007ff83414d333d10609882b11ab4fd485345a Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Frederik Gladhorn2015-02-242-4/+20
|\ \
| * \ Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-202-4/+20
| |\ \ | | |/ | | | | | | Change-Id: I96657102802860c8490c162462324e661592d879
| | * fix the port in Host field in handshake requestLiang Qi2015-02-201-2/+14
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-39355 Change-Id: I06993193fe9618ace93552aed573a3eee5de18fa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| | * Fix keyword for OriginLiang Qi2015-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | In RFC 6455(v13), the correct keyword is Origin. Task-number: QTBUG-44310 Change-Id: I009f079e01e213eb232b0dfc1a441305f3d9e588 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
View Lorry Controller Status