| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: I721b5481e2b4d8fb5c7bf84e2cfafd30b52a963e
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
|/ / /
| | |
| | |
| | | |
Change-Id: I68da577c0514c42a3a4de915a9c32dc20204970e
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: Ic66a4cabbe0a2af1fa59ae33026a236437434a85
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I4a88ddf6722f4b29512fbec71f3d055591e625ba
|
| | |\
| | | |
| | | |
| | | | |
Change-Id: I394635e8722f98fb57b305e26264047feafc3b4f
|
| | |/
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ic6f8ac83bd779f4ba0576c9f849f9d7afa77a412
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
| | |
| | |
| | |
| | | |
Change-Id: Ide48dd1b6e21a6441473c7e408c7cf5513fd30db
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It makes sense to first start listening (server.listen = true) and then
connect (socket.active = true).
Task-number: QTBUG-59388
Change-Id: I4235dad87ee3a62ebf75cec39e5d9fa4b7ed7552
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
| | |\
| | | |
| | | |
| | | | |
Change-Id: Iea2ec6f528dfcbbedabfc6cac01293ace2d26835
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
File to test binary compatibility for 5.10 added
Change-Id: Iade26098325ba00e45cc055c9ebf8ff8fe2cd67b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: I4e8cb48a3626209222ddada7a7560150f6382074
|
| |\ \ \
| | | | |
| | | | |
| | | | | |
Change-Id: I1b001ff2a374ec53a9247adc2d91db12ef2a8923
|
| | |\ \ \
| |/ / / /
| | | | _
| | | | |
Change-Id: I3ac04c00c6da760a0125970c55866055709a3371
|
| | |/
| | |
| | |
| | |
| | | |
Change-Id: I84dc0e201d92f1ad86565155e25f28a9ef5c5a9b
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
All this home-grown parsing should be replaced with code from the qhttp*
classes. This would result in a big refactoring though, so this commit
at least tries to make the header parsing RFC compliant and not choke
on perfectly legal "Header:Value" messages.
Change-Id: I14303610dc7187b8d8595568fb221c18e4e0d515
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/websockets/qwebsocket_p.cpp
tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
Change-Id: I40922fab198a09a3fbba1b2f11b42f2d40e53720
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ie9ff1794bd623c46ae895d75a6016cd56dec9576
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I69f37f9304f24709a823fffd14e676c097712329
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
| |\ \
| | |/
| | |
| | | |
Change-Id: I3ae5df71f201cfdb9a4c9e7d90a60d1f9792700a
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If QWebSocket fires signal sslErrors the
QSslConfiguration of QWebSocket is not updated.
So client application cannot check it in
implemented slot.
Fix this by calling the update method like
for encrypted signal.
Sibling of QTBUG-40401.
Change-Id: I18b39f6b6a0791ae67fc2bff5cf2c04a22b0ab85
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Looks like QVERIFY(spy.wait()) is a little bit flaky. We should
check the count of the spy if it was successful instead of the
return value of wait since wait will return false even if the signal
was delivered before the call to wait().
Change-Id: I5f9031685dfa69b00155fa22602bab998843cb68
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In the rare case where the handshake was received before the signal and
slot was connected it would never invoke handshakeReceived and the
server would keep waiting.
Task-number: QTBUG-64026
Change-Id: I86d54031d2583b6a0cf2b5348889b5ef859b9aab
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ic41f3745e800ba54153b36f269017075297c2402
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I509332fa23bcf2cf2e6c10b7edacb4157f025ff9
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I59bcb929a37096e7c5a14d4003f26267bd0d752a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-63707
Change-Id: Iaba78256f790bc422790a03fccb841e6e6482fc1
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
examples/websockets/simplechat/chatserver.cpp
Change-Id: I98697cef4c05516b5b4122ad81c084546d57115f
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I4af142703e469b56236b73335a93f6960534c0f1
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | | |
Change-Id: Ic2a08fd6c43078bf571e37234a52234827537394
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ic2c1569e84296a4cc2c64e5861fac0a7e4176887
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-62724
Change-Id: I944d2a3e296d170913793a3b7185306ec24dac18
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ie16c88fb0a215efe5f152ea2d12c984f8d9e0878
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ic1f4b357138457eb33ac9154a280f499664c3c78
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- 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>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I0988a4119b5bd790d286c16b5647d97d4d95aef0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|/ /
| |
| |
| | |
Change-Id: Ic434d7a7e2c6416edb529de8f6008d1cf19fd21f
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I3dd9c568ed9160510bff527355ecfbed5d4690a9
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |\
| | |
| | |
| | | |
Change-Id: Icd6d3b26e51eab31b0b708411570cfc6f6099e3e
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ifb831b8d4d9edbf73fa3021dacc429368e92f32b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| | |
| | |
| | |
| | | |
Change-Id: I1439731a3a2b4cd74ca7d5bec958e0181e902d40
|
| |/
| |
| |
| |
| |
| |
| | |
Binary compatibility file updated for Qt 5.9.0.
Change-Id: I58561a76c8f9d3353d9cf352dd39734044c3e8e2
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ib89576c203259364795a3b1caf0717fb28126629
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |\
| | |
| | |
| | | |
Change-Id: Ic9a7d0f871c1533705f5567a665607403cb983ee
|