diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-07 03:02:05 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-07 03:02:05 +0100 |
| commit | 5615716a63f4994a1a82cc363c49f314e0a84332 (patch) | |
| tree | 0dc73e6b934a218d2889bd6042fa4c9f63088413 /src/websockets/qwebsocket_p.cpp | |
| parent | 69874130efc7f87147a3317d6ce7a17e6f0a466b (diff) | |
| parent | 5bc1a1f85fedd7d65298f0a4c8ea79fb0670c0d7 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ib31d3b50e4498cdfc55b68ebc5993750b5ee7ce1
Diffstat (limited to 'src/websockets/qwebsocket_p.cpp')
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index cd0b918..6ca8d1a 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -1072,8 +1072,7 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket) } else if (m_httpStatusCode == 400) { //HTTP/1.1 400 Bad Request if (!version.isEmpty()) { - const QStringList versions = version.split(QStringLiteral(", "), - QString::SkipEmptyParts); + const QStringList versions = version.split(QStringLiteral(", "), Qt::SkipEmptyParts); if (!versions.contains(QString::number(QWebSocketProtocol::currentVersion()))) { //if needed to switch protocol version, then we are finished here //because we cannot handle other protocols than the RFC one (v13) |