| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
BC file added for QtWebSockets module
Change-Id: I94fdae9d83003ebe17a2799794047ee095880205
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
|
|\
| |
| |
| | |
Change-Id: I95f1e6fd6e9033e27bcf618e1eb50cd011ac5c4b
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| | |
Change-Id: I912302259dc84aa15ca8bb8a498c5c5b148c2864
|
| |
| |
| |
| |
| | |
Change-Id: I4c9f3a50c24f945c0f14010a10ff808d8adf7845
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: Ie37e1ec038e82c845066f92e5f87e355d627e2ff
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771
Change-Id: Ib20a0dc7d6e5c0d1ed906af5156d7d9a03e7a121
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| | |
Change-Id: I9cb90aca8c03c569d469f25b6722c65475c510fe
|
|\ \
| | |
| | |
| | | |
Change-Id: I067bed686680780e66e526e7e578adf912aaacce
|
|/ /
| |
| |
| |
| |
| |
| | |
Change-Id: Ia4cd6851038db8c7b983f6f270381a2bce6a3312
Task-number: QTBUG-53913
Reviewed-by: Sami Makkonen <sami.makkonen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I80cd189fc82481fdc2241db6d2a7d95537c340a6
|
| |
| |
| |
| | |
Change-Id: Ibaed49134295c769c9c24f455edadce0434964aa
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
it's done centrally now.
Change-Id: I0378a3e7b0b881909009719e05e390633eec6466
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: I49d9fda43374776685d2ab1fa653287447d34028
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|\ \
| |/
| |
| | |
Change-Id: I7ebcdc16a8b65103abfb9640c990eddbeccdef05
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |\
| | |
| | |
| | | |
Change-Id: I11c3b9f39d56d3b26e0f3c4012cb2e3afee46341
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-51087
Change-Id: I98190d1981c864ee3fc5dc6d7e5375527536adfd
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|\ \ \
| |/ /
| | |
| | | |
Change-Id: I57c01d5a8836903352d7edadc4a10972f57399eb
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
... 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>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I6c905059f2e194c7209e01ce48e84ed571add847
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I42592e133b25ebd271b387353a868b68825291d5
|
| |/
| |
| |
| | |
Change-Id: I3aba269d326ab71e14ba6291c9c554f010445e24
|
| |
| |
| |
| |
| |
| | |
Change-Id: I373d3a174ed5c9d53fddb7254b04628f2ee8526d
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
From Qt 5.7 -> examples are lisenced under BSD license, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new BSD header instead of LGPL21 one
(in those files which will be under BSD)
Change-Id: I0166fb7434185f9d151631a51124945150cdd633
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some
exceptions, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one
(in those files which will be under GPL 3 with exceptions)
Change-Id: I191cd4111d18052fbe80bbe21bf851bf4795a1a6
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new LGPL header instead of LGPL21 one
(in those files which will be under LGPL v3)
Change-Id: I8c17da1f7e2f0a620e3627fa7f8087f185545c8a
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ie652bddf7f98271d01ebe6818817ea28d9c83fae
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: I266b98d309a8912efb988a4c7a006d6fefb48531
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|\ \
| |/
| |
| | |
Change-Id: I8d2c4b0982623839b880a9d8fbe7f5ee69d33ad3
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ib41421e87af66d6ba9248b66e713e452d226143d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
|
| |\
| | |
| | |
| | | |
Change-Id: I7b56e21fa93d0d196887e8dfa683050f3a032186
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
For e8335d48, the test is flaky, but old CI treated it as a PASS.
Task-number: QTBUG-48843
Change-Id: I4d2c0d270824d7b1e954e9174493fba2c1c5433f
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-48714
Change-Id: I0e9b54b98b561f3d82f542ac5d311ca1aca252eb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
0610115192f4a1 changed the port type from uint16 to int.
Change-Id: I800fe254648d026c8e29d93a2945bdf8380aa950
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Icc8c6928619b2e16f5f13e852e559438faf9a03c
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
Change-Id: Ie4184b0788b6a0a5a85ca8e4d1547c33f7027ca0
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| |\ \
| | |/
| | |
| | | |
Change-Id: Ica80f965969095793f45e9a5b724335ac0a79040
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
.qmake.conf
Change-Id: I3f9a7c0afccb925e1b821ca7191dab4e1855cc21
|