summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-012-0/+5021
| |\ \ | | |/ | | | | | | Change-Id: I95f1e6fd6e9033e27bcf618e1eb50cd011ac5c4b
| | * Added binary compatibility data files to QtWebSockets for Qt 5.6Milla Pohjanheimo2016-09-302-0/+5021
| | | | | | | | | | | | | | | | | | | | | | | | Added the generated data files for the binary compatibility tests for QtWebSockets for Qt 5.6 Change-Id: I2fce98cac5eec3dbf6192782ea419653ea5f3db2 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-171-1/+1
| |\ \ | | |/ | | | | | | Change-Id: I912302259dc84aa15ca8bb8a498c5c5b148c2864
| | * Doc: Add verb to WebSockets introv5.6.25.6.2Kai Koehne2016-08-121-1/+1
| | | | | | | | | | | | | | | Change-Id: I4c9f3a50c24f945c0f14010a10ff808d8adf7845 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Make sure we find the ssl feature from QtNetworkv5.8.0-beta1Lars Knoll2016-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Required to be able to continue to compile this module with the modularized configure Change-Id: I9c929a1ab8e856922bacb92ca17c8e1588fa591b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Eradicate Q_FOREACH and Java-style loops and mark the module as Q_FOREACH-freeMarc Mutz2016-09-076-18/+14
| | | | | | | | | | | | | | | | | | Change-Id: I200f72423f13b54c636e995b120a70968b0e0758 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Fix loading of QML pluginsv5.8.0-alpha1Simon Hausmann2016-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 709f6370884b110def2e4665df8fa7bbf5fae734 the plugin loader is strict about requiring the correct interface id, to avoid loading unrelated plugins in the loader thread (which they may not be prepared to do). Change-Id: If892bc1d3d1762ffd9dad9dd19deda84baba4159 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | | Clean up QT_CONFIG usageLars Knoll2016-08-199-9/+9
| | | | | | | | | | | | | | | | | | | | | Use the newer qtConfig() method instead. Change-Id: I197dbe01edaf8696ee06d30400bd18e53cf69c94 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-026-8/+51
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I593c47e7aeebb7997f42a7408a8d22704d2713a1
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-015-8/+14
| |\ \ | | |/ | | | | | | Change-Id: Ie37e1ec038e82c845066f92e5f87e355d627e2ff
| | * Fixed erroneous detection of server disconnect conditionOleksandr Tymoshenko2016-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractSocket::atEnd does not check actual connection state it only checks if data is ready to be read. Under some conditions (e.g. slow network) data may not be available yet but it doesn't mean the server dropped connection. When more data comes FSM will pick it up and handle as expected. The right way to check disconnect is to check for actual socket state. Task-number: QTBUG-51069 Change-Id: I17d7110fbefdba2d5378a71935ab5923f8c1bf3e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-163-3/+3
| | | | | | | | | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: Ib20a0dc7d6e5c0d1ed906af5156d7d9a03e7a121 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Doc: Also mention QML Import in index pageKai Koehne2016-05-231-4/+10
| | | | | | | | | | | | | | | | | | | | | qtwebsockets-index.html is the entry point for both C++ and QML API. Change-Id: I81efb2d7b931cce0d63efc2f25ce89904abcbfad Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | | | | | Change-Id: I9cb90aca8c03c569d469f25b6722c65475c510fe
| * | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-0/+37
| |\ \ | | | | | | | | | | | | Change-Id: I067bed686680780e66e526e7e578adf912aaacce
| | * | Mention license change in 5.7.0 changelog.v5.7.05.7.0Jani Heikkinen2016-06-081-0/+37
| |/ / | | | | | | | | | | | | | | | | | | Change-Id: Ia4cd6851038db8c7b983f6f270381a2bce6a3312 Task-number: QTBUG-53913 Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Add support for TLS PSK (client and server)André Klitzing2016-06-129-0/+182
| | | | | | | | | | | | | | | | | | | | | [ChangeLog][QWebSocket] It is now possible to use TLS PSK ciphersuites. Change-Id: I9e96669494cec5e6a4e076fe9f10fcd4ef6358a4 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Doc: Update WebSockets import to 1.1Kai Koehne2016-05-261-2/+2
| | | | | | | | | | | | | | | Change-Id: Ied0b921fb5bc666f0cec7c722880f1c91e1c6923 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-249-5/+25
|\ \ \ | |/ / | | | | | | Change-Id: Ic4a2b48535dd9b22a950b84de4bfa2728a859902
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-199-5/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I80cd189fc82481fdc2241db6d2a7d95537c340a6
| | * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | Change-Id: Ibaed49134295c769c9c24f455edadce0434964aa
| | * 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>
| | * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-061-1/+0
| | | | | | | | | | | | | | | | | | | | | it's done centrally now. Change-Id: I0378a3e7b0b881909009719e05e390633eec6466 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * add example installsOswald Buddenhagen2016-05-067-3/+24
| | | | | | | | | | | | | | | Change-Id: I49d9fda43374776685d2ab1fa653287447d34028 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-0818-56/+204
|\ \ \ | |/ / | | | | | | Change-Id: I8a2d6875b68c99786f99ec0dc380f8725c6abd42
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0814-53/+193
| |\ \ | | |/ | | | | | | Change-Id: I7ebcdc16a8b65103abfb9640c990eddbeccdef05
| | * 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>
| * | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-073-3/+3
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I57c01d5a8836903352d7edadc4a10972f57399eb
| | * | 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>
| * | | Enable using the module in a statically built applicationv5.7.0-alpha1Andy Shaw2016-02-261-0/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I6c905059f2e194c7209e01ce48e84ed571add847 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | | Remove unused variableFrank Meerkoetter2016-04-071-3/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I0ffeb96bfab3543f94501bf1605bb6c899ef466f Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | | Limit variable scopeFrank Meerkoetter2016-04-071-2/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I8930d132cfcf09edeaa30bb052d9ea0a5ee47a98 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | | No need to manually call the default constructorFrank Meerkoetter2016-04-074-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning up the examples a little. There is no need to explicitly call the default constructor for these members. Change-Id: I7a931ea78f6db1bc1c70f7c49bc85f51e8666d47 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | | Remove dead codeFrank Meerkoetter2016-04-071-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I528533bffe34e0df66b4a5b7aad98d54e3ce718c Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | | Limit function visibility to the translation unitFrank Meerkoetter2016-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not create a global symbol. Change-Id: I176c0b4441815e5c6ca02b89b1fe0dd5a1bcdb2f Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | | Add binary message support to QML WebSocket typeNobuaki Sukegawa2016-03-056-6/+66
| | | | | | | | | | | | | | | | | | | | Change-Id: I4472e899606d261420141e7b382717cbe12943c8 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / / | | | | | | | | | Change-Id: I8e3e66926b77dc0a6e27fd9bdcdbdf486c14d802
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-151-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I42592e133b25ebd271b387353a868b68825291d5
| * | Bump versionOswald Buddenhagen2016-02-081-1/+1
| |/ | | | | | | Change-Id: I3aba269d326ab71e14ba6291c9c554f010445e24
| * 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>
View Lorry Controller Status