| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
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
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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>
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: I52f9c41b82d1c4f7845e88a5d7787307f0242691
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
LGPLv3 refers to it but does not include it in its body.
Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: I6e774e49fb3079797be71a0fe8bdf9431bac7886
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix usage of API that is marked deprecated.
Change-Id: Ie1bd25b22a8bd4faa6885ac3670dcc3c25c17ab2
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
|/ / /
| | |
| | |
| | |
| | | |
Change-Id: I0315e4692f680dec121f8e8fa5d90dd2826f4900
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
|\ \ \
| |/ /
| | |
| | | |
Change-Id: Ia29cf611432e0be43e0eaf04384e48f68c93af3e
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I1d05bcfee5715cd06285252202ac00aaa80825eb
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
src/websockets/qwebsocket_p.cpp
Change-Id: Ibcc1898263cc8bc80066370f045df6a217e46574
|
| | |
| | |
| | |
| | | |
Change-Id: Ie226303b4a1059c22fa5752adcb621fcc05a53e8
|
| |\ \
| | | |
| | | |
| | | | |
Change-Id: Ieca9be8fcf6c0411442478babe3a47a681cbf63c
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ia9541416b13519389e5a2061a8ef978046570286
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Luca Niccoli <lultimouomo@gmail.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-41044
Change-Id: I074573e814de63e009744a11054365fb2f25bdb9
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
| |/ /
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ia18acdc3c54e2bb48209406d2a6f9e156b67324c
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I7cacbce1625015636e92b2fd5f2ade694a97a5c9
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Idbfbaa86675381110f35118baf16cac891976707
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
cmake is not included.
Change-Id: I9ab6244d8b6b3752f26070b0b15ae70c0cab6d82
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Properly encode the provided sequence in UTF-8, so that the XML output of
testlib is correctly encoded. Otherwise parsing the XML output in an automated
manner breaks.
Change-Id: Ibf0d5d6d067f4daeb7d2efd242d64b5f472d7b83
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In a5cb3b8ff10fcf1def8bde6f814582be1c19b83b I made the tst_openRequest
less reliable because the socketConnectedSpy is no longer checked.
Change-Id: Id721fa4aa203eeb85a5fce85a5270bc14cc37ab1
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Iad643950d669addf90f68b2bf9be29c755f9c1d9
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-40842
Change-Id: I02787a0e55701966e564a312d51297f4160bd89a
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/websockets/qwebsocket_p.cpp
Change-Id: Ia6434b282b4a0ee92e2b2a8664389f325bd0fcb0
|