Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-websockets for openSUSE:Factory checked in at 2023-04-05 21:32:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-websockets (Old) and /work/SRC/openSUSE:Factory/.qt6-websockets.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-websockets" Wed Apr 5 21:32:26 2023 rev:13 rq:1077353 version:6.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-websockets/qt6-websockets.changes 2023-03-17 17:04:28.089745355 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-websockets.new.19717/qt6-websockets.changes 2023-04-05 21:37:27.027183301 +0200 @@ -1,0 +2,6 @@ +Mon Apr 3 10:03:17 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 6.5.0 + * https://www.qt.io/blog/qt-6.5-lts-released + +------------------------------------------------------------------- Old: ---- qtwebsockets-everywhere-src-6.4.3.tar.xz New: ---- qtwebsockets-everywhere-src-6.5.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-websockets.spec ++++++ --- /var/tmp/diff_new_pack.L3FZmV/_old 2023-04-05 21:37:27.543186247 +0200 +++ /var/tmp/diff_new_pack.L3FZmV/_new 2023-04-05 21:37:27.551186292 +0200 @@ -1,7 +1,7 @@ # # spec file for package qt6-websockets # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,8 @@ # -%define real_version 6.4.3 -%define short_version 6.4 +%define real_version 6.5.0 +%define short_version 6.5 %define tar_name qtwebsockets-everywhere-src %define tar_suffix %{nil} # @@ -27,7 +27,7 @@ %endif # Name: qt6-websockets%{?pkg_suffix} -Version: 6.4.3 +Version: 6.5.0 Release: 0 Summary: Qt 6 WebSockets library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) @@ -38,11 +38,11 @@ BuildRequires: qt6-core-private-devel BuildRequires: qt6-network-private-devel BuildRequires: qt6-qml-private-devel -BuildRequires: cmake(Qt6Core) -BuildRequires: cmake(Qt6Gui) -BuildRequires: cmake(Qt6Network) -BuildRequires: cmake(Qt6Quick) -BuildRequires: cmake(Qt6QuickTest) +BuildRequires: cmake(Qt6Core) = %{real_version} +BuildRequires: cmake(Qt6Gui) = %{real_version} +BuildRequires: cmake(Qt6Network) = %{real_version} +BuildRequires: cmake(Qt6Quick) = %{real_version} +BuildRequires: cmake(Qt6QuickTest) = %{real_version} %if "%{qt6_flavor}" == "docs" BuildRequires: qt6-tools %{qt6_doc_packages} @@ -74,15 +74,15 @@ %package devel Summary: Qt 6 WebSockets library - Development files Requires: libQt6WebSockets6 = %{version} -Requires: cmake(Qt6Network) +Requires: cmake(Qt6Network) = %{real_version} %description devel Development files for the Qt 6 WebSockets library %package private-devel Summary: Non-ABI stable API for the Qt 6 WebSockets library -Requires: qt6-core-private-devel Requires: cmake(Qt6WebSockets) = %{real_version} +%requires_eq qt6-core-private-devel %description private-devel This package provides private headers of libQt6WebSockets that do not have any ++++++ qtwebsockets-everywhere-src-6.4.3.tar.xz -> qtwebsockets-everywhere-src-6.5.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/.cmake.conf new/qtwebsockets-everywhere-src-6.5.0/.cmake.conf --- old/qtwebsockets-everywhere-src-6.4.3/.cmake.conf 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/.cmake.conf 2023-03-28 16:23:33.000000000 +0200 @@ -1,2 +1,3 @@ -set(QT_REPO_MODULE_VERSION "6.4.3") +set(QT_REPO_MODULE_VERSION "6.5.0") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") +set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/.tag new/qtwebsockets-everywhere-src-6.5.0/.tag --- old/qtwebsockets-everywhere-src-6.4.3/.tag 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/.tag 2023-03-28 16:23:33.000000000 +0200 @@ -1 +1 @@ -5c50ad5eef1fc179d846e175b0612a76b2a63d09 +5c92cce2f79edcd26d05608d86351b82d1c00373 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qtwebsockets.pro. cmake_minimum_required(VERSION 3.16) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/dependencies.yaml new/qtwebsockets-everywhere-src-6.5.0/dependencies.yaml --- old/qtwebsockets-everywhere-src-6.4.3/dependencies.yaml 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/dependencies.yaml 2023-03-28 16:23:33.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 519d2d8f442409e86a0ee2fa16bd543342180861 + ref: aea92807be2567c4212b96ae67de7137075ba4ee required: true ../qtdeclarative: - ref: 7161b3a04d08aea891bd7c7e459437260d29c3f3 + ref: 3238e18d6b0dc45d2e765fb0b93da5cbf3f396ec required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/examples/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/examples/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/examples/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/examples/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_examples_build_begin(EXTERNAL_BUILD) add_subdirectory(websockets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_internal_add_example(echoclient) qt_internal_add_example(echoserver) qt_internal_add_example(simplechat) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/echoclient/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/echoclient/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/echoclient/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/echoclient/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + cmake_minimum_required(VERSION 3.16) project(echoclient LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/echoserver/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/echoserver/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/echoserver/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/echoserver/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + cmake_minimum_required(VERSION 3.16) project(echoserver LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/qmlwebsocketclient/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/qmlwebsocketclient/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/qmlwebsocketclient/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/qmlwebsocketclient/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + cmake_minimum_required(VERSION 3.16) project(qmlwebsocketclient LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml --- old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml 2023-03-28 16:23:33.000000000 +0200 @@ -4,13 +4,13 @@ import QtWebSockets 1.0 Rectangle { - width: 360 + width: 640 height: 360 WebSocket { id: socket - url: "ws://echo.websocket.org" - onTextMessageReceived: { + url: "ws://ws.ifelse.io" + onTextMessageReceived: function(message) { messageBox.text = messageBox.text + "\nReceived message: " + message } onStatusChanged: if (socket.status == WebSocket.Error) { @@ -25,8 +25,8 @@ WebSocket { id: secureWebSocket - url: "wss://echo.websocket.org" - onTextMessageReceived: { + url: "wss://ws.ifelse.io" + onTextMessageReceived: function(message) { messageBox.text = messageBox.text + "\nReceived secure message: " + message } onStatusChanged: if (secureWebSocket.status == WebSocket.Error) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/qmlwebsocketserver/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/qmlwebsocketserver/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/qmlwebsocketserver/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/qmlwebsocketserver/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + cmake_minimum_required(VERSION 3.16) project(qmlwebsocketserver LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml --- old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml 2023-03-28 16:23:33.000000000 +0200 @@ -15,7 +15,7 @@ WebSocketServer { id: server listen: true - onClientConnected: { + onClientConnected: function(webSocket) { webSocket.onTextMessageReceived.connect(function(message) { appendMessage(qsTr("Server received message: %1").arg(message)); webSocket.sendTextMessage(qsTr("Hello Client!")); @@ -29,7 +29,9 @@ WebSocket { id: socket url: server.url - onTextMessageReceived: appendMessage(qsTr("Client received message: %1").arg(message)) + onTextMessageReceived: function(message) { + appendMessage(qsTr("Client received message: %1").arg(message)); + } onStatusChanged: { if (socket.status == WebSocket.Error) { appendMessage(qsTr("Client error: %1").arg(socket.errorString)); @@ -39,6 +41,14 @@ } } + Timer { + interval: 100 + running: true + onTriggered: { + socket.active = true; + } + } + Text { id: messageBox text: qsTr("Click to send a message!") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/simplechat/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/simplechat/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/simplechat/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/simplechat/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + cmake_minimum_required(VERSION 3.16) project(simplechatserver LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/sslechoclient/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/sslechoclient/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/sslechoclient/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/sslechoclient/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + cmake_minimum_required(VERSION 3.16) project(sslechoclient LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/sslechoserver/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/sslechoserver/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/examples/websockets/sslechoserver/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/examples/websockets/sslechoserver/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + cmake_minimum_required(VERSION 3.16) project(sslechoserver LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qdefaultmaskgenerator_p.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qdefaultmaskgenerator_p.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qdefaultmaskgenerator_p.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qdefaultmaskgenerator_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qdefaultmaskgenerator_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocket_p.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocket_p.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocket_p.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocket_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsocket_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketcorsauthenticator_p.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketcorsauthenticator_p.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsocketcorsauthenticator_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketdataprocessor_p.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketdataprocessor_p.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketdataprocessor_p.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketdataprocessor_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsocketdataprocessor_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketframe_p.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketframe_p.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketframe_p.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketframe_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsocketframe_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeoptions_p.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeoptions_p.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeoptions_p.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeoptions_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsockethandshakeoptions_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakerequest_p.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakerequest_p.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakerequest_p.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakerequest_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsockethandshakerequest_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeresponse_p.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeresponse_p.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeresponse_p.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeresponse_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsockethandshakeresponse_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketprotocol_p.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketprotocol_p.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketprotocol_p.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketprotocol_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsocketprotocol_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketserver_p.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketserver_p.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketserver_p.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketserver_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsocketserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QMaskGenerator new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QMaskGenerator --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QMaskGenerator 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QMaskGenerator 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "qmaskgenerator.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QWebSocket new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QWebSocket --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QWebSocket 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QWebSocket 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "qwebsocket.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QWebSocketCorsAuthenticator new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QWebSocketCorsAuthenticator --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QWebSocketCorsAuthenticator 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QWebSocketCorsAuthenticator 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "qwebsocketcorsauthenticator.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QWebSocketHandshakeOptions new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QWebSocketHandshakeOptions --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QWebSocketHandshakeOptions 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QWebSocketHandshakeOptions 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "qwebsockethandshakeoptions.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QWebSocketProtocol new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QWebSocketProtocol --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QWebSocketProtocol 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QWebSocketProtocol 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "qwebsocketprotocol.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QWebSocketServer new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QWebSocketServer --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QWebSocketServer 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QWebSocketServer 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "qwebsocketserver.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QtWebSockets new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QtWebSockets --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QtWebSockets 2023-03-12 11:00:39.218240500 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QtWebSockets 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -#ifndef QT_QTWEBSOCKETS_MODULE_H -#define QT_QTWEBSOCKETS_MODULE_H -#include <QtWebSockets/QtWebSocketsDepends> -#include "qmaskgenerator.h" -#include "qwebsocket.h" -#include "qwebsocketcorsauthenticator.h" -#include "qwebsockethandshakeoptions.h" -#include "qwebsocketprotocol.h" -#include "qwebsocketserver.h" -#include "qtwebsocketsversion.h" -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QtWebSocketsVersion new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QtWebSocketsVersion --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/QtWebSocketsVersion 2023-03-12 11:00:39.218240500 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/QtWebSocketsVersion 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "qtwebsocketsversion.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/headers.pri new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/headers.pri --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/headers.pri 2023-03-12 11:00:39.218240500 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/headers.pri 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -SYNCQT.HEADER_FILES = qmaskgenerator.h qwebsocket.h qwebsocketcorsauthenticator.h qwebsockethandshakeoptions.h qwebsocketprotocol.h qwebsockets_global.h qwebsocketserver.h -SYNCQT.GENERATED_HEADER_FILES = QMaskGenerator QWebSocket QWebSocketCorsAuthenticator QWebSocketHandshakeOptions QWebSocketProtocol QWebSocketServer qtwebsocketsversion.h QtWebSocketsVersion QtWebSockets -SYNCQT.PRIVATE_HEADER_FILES = qdefaultmaskgenerator_p.h qwebsocket_p.h qwebsocketcorsauthenticator_p.h qwebsocketdataprocessor_p.h qwebsocketframe_p.h qwebsockethandshakeoptions_p.h qwebsockethandshakerequest_p.h qwebsockethandshakeresponse_p.h qwebsocketprotocol_p.h qwebsocketserver_p.h -SYNCQT.QPA_HEADER_FILES = -SYNCQT.CLEAN_HEADER_FILES = qmaskgenerator.h qwebsocket.h qwebsocketcorsauthenticator.h qwebsockethandshakeoptions.h qwebsocketprotocol.h qwebsockets_global.h qwebsocketserver.h -SYNCQT.INJECTIONS = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qmaskgenerator.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qmaskgenerator.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qmaskgenerator.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qmaskgenerator.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../src/websockets/qmaskgenerator.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qtwebsocketsversion.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qtwebsocketsversion.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qtwebsocketsversion.h 2023-03-12 11:00:39.218240500 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qtwebsocketsversion.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -/* This file was generated by syncqt. */ -#ifndef QT_QTWEBSOCKETS_VERSION_H -#define QT_QTWEBSOCKETS_VERSION_H - -#define QTWEBSOCKETS_VERSION_STR "6.4.3" - -#define QTWEBSOCKETS_VERSION 0x060403 - -#endif // QT_QTWEBSOCKETS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qwebsocket.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qwebsocket.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qwebsocket.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qwebsocket.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../src/websockets/qwebsocket.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qwebsocketcorsauthenticator.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qwebsocketcorsauthenticator.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qwebsocketcorsauthenticator.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qwebsocketcorsauthenticator.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../src/websockets/qwebsocketcorsauthenticator.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qwebsockethandshakeoptions.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qwebsockethandshakeoptions.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qwebsockethandshakeoptions.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qwebsockethandshakeoptions.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../src/websockets/qwebsockethandshakeoptions.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qwebsocketprotocol.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qwebsocketprotocol.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qwebsocketprotocol.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qwebsocketprotocol.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../src/websockets/qwebsocketprotocol.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qwebsockets_global.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qwebsockets_global.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qwebsockets_global.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qwebsockets_global.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../src/websockets/qwebsockets_global.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qwebsocketserver.h new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qwebsocketserver.h --- old/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qwebsocketserver.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/include/QtWebSockets/qwebsocketserver.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../src/websockets/qwebsocketserver.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/src/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/src/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from src.pro. add_subdirectory(websockets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/imports/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/src/imports/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/src/imports/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/imports/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from imports.pro. add_subdirectory(qmlwebsockets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/imports/qmlwebsockets/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/src/imports/qmlwebsockets/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/src/imports/qmlwebsockets/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/imports/qmlwebsockets/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_internal_add_qml_module(qmlwebsockets URI "QtWebSockets" VERSION "${PROJECT_VERSION}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/imports/qmlwebsockets/qqmlwebsocket.cpp new/qtwebsockets-everywhere-src-6.5.0/src/imports/qmlwebsockets/qqmlwebsocket.cpp --- old/qtwebsockets-everywhere-src-6.4.3/src/imports/qmlwebsockets/qqmlwebsocket.cpp 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/imports/qmlwebsockets/qqmlwebsocket.cpp 2023-03-28 16:23:33.000000000 +0200 @@ -214,13 +214,12 @@ m_webSocket.reset(socket); if (m_webSocket) { // explicit ownership via QScopedPointer - m_webSocket->setParent(Q_NULLPTR); + m_webSocket->setParent(nullptr); connect(m_webSocket.data(), &QWebSocket::textMessageReceived, this, &QQmlWebSocket::textMessageReceived); connect(m_webSocket.data(), &QWebSocket::binaryMessageReceived, this, &QQmlWebSocket::binaryMessageReceived); - typedef void (QWebSocket::* ErrorSignal)(QAbstractSocket::SocketError); - connect(m_webSocket.data(), static_cast<ErrorSignal>(&QWebSocket::error), + connect(m_webSocket.data(), &QWebSocket::errorOccurred, this, &QQmlWebSocket::onError); connect(m_webSocket.data(), &QWebSocket::stateChanged, this, &QQmlWebSocket::onStateChanged); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/imports/qmlwebsockets/qqmlwebsocketserver.h new/qtwebsockets-everywhere-src-6.5.0/src/imports/qmlwebsockets/qqmlwebsocketserver.h --- old/qtwebsockets-everywhere-src-6.4.3/src/imports/qmlwebsockets/qqmlwebsocketserver.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/imports/qmlwebsockets/qqmlwebsocketserver.h 2023-03-28 16:23:33.000000000 +0200 @@ -28,7 +28,7 @@ Q_PROPERTY(bool accept READ accept WRITE setAccept NOTIFY acceptChanged) public: - explicit QQmlWebSocketServer(QObject *parent = Q_NULLPTR); + explicit QQmlWebSocketServer(QObject *parent = nullptr); ~QQmlWebSocketServer() override; void classBegin() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/websockets/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/src/websockets/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/src/websockets/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/websockets/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from websockets.pro. ##################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocket.cpp new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocket.cpp --- old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocket.cpp 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocket.cpp 2023-03-28 16:23:33.000000000 +0200 @@ -40,7 +40,7 @@ */ /*! - \page echoclient.html example + \page echoclient.html \title QWebSocket client example \brief A sample WebSocket client that sends a message and displays the message that it receives back. @@ -172,18 +172,6 @@ \sa textMessageReceived() */ /*! - \fn void QWebSocket::error(QAbstractSocket::SocketError error); - - This signal is emitted after an error occurred. The \a error - parameter describes the type of error that occurred. - - QAbstractSocket::SocketError is not a registered metatype, so for queued - connections, you will have to register it with Q_DECLARE_METATYPE() and - qRegisterMetaType(). - - \sa error(), errorString() -*/ -/*! \fn void QWebSocket::sslErrors(const QList<QSslError> &errors) QWebSocket emits this signal after the SSL handshake to indicate that one or more errors have occurred while establishing the identity of the peer. @@ -996,4 +984,25 @@ return QWebSocketPrivate::maxOutgoingFrameSize(); } +/*! + \fn void QWebSocket::errorOccurred(QAbstractSocket::SocketError error); + + \since 6.5 + \brief This signal is emitted after an error occurred. + + The \a error parameter describes the type of error that occurred. + + QAbstractSocket::SocketError is not a registered metatype, so for queued + connections, you will have to register it with Q_DECLARE_METATYPE() and + qRegisterMetaType(). + + \sa error(), errorString() +*/ +#if QT_DEPRECATED_SINCE(6, 5) +/*! + \fn void QWebSocket::error(QAbstractSocket::SocketError error); + \deprecated [6.5] Use errorOccurred(QAbstractSocket::SocketError error) instead. +*/ +#endif + QT_END_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocket.h new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocket.h --- old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocket.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocket.h 2023-03-28 16:23:33.000000000 +0200 @@ -123,7 +123,11 @@ void binaryFrameReceived(const QByteArray &frame, bool isLastFrame); void textMessageReceived(const QString &message); void binaryMessageReceived(const QByteArray &message); +#if QT_DEPRECATED_SINCE(6, 5) + QT_DEPRECATED_VERSION_X_6_5("Use errorOccurred instead") void error(QAbstractSocket::SocketError error); +#endif + void errorOccurred(QAbstractSocket::SocketError error); void pong(quint64 elapsedTime, const QByteArray &payload); void bytesWritten(qint64 bytes); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocket_p.cpp new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocket_p.cpp --- old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocket_p.cpp 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocket_p.cpp 2023-03-28 16:23:33.000000000 +0200 @@ -37,8 +37,6 @@ namespace { -constexpr int MAX_HEADERLINE_LENGTH = 8 * 1024; // maximum length of a http request header line -constexpr int MAX_HEADERLINES = 100; // maximum number of http request header lines constexpr quint64 MAX_OUTGOING_FRAME_SIZE_IN_BYTES = std::numeric_limits<int>::max() - 1; constexpr quint64 DEFAULT_OUTGOING_FRAME_SIZE_IN_BYTES = 512 * 512 * 2; // default size of a frame when sending a message @@ -175,8 +173,14 @@ QWebSocketPrivate::~QWebSocketPrivate() { #ifdef Q_OS_WASM - if (m_socketContext) + if (m_socketContext) { + uint16_t m_readyState; + emscripten_websocket_get_ready_state(m_socketContext, &m_readyState); + if (m_readyState == 1 || m_readyState == 0) { + emscripten_websocket_close(m_socketContext, 1000,""); + } emscripten_websocket_delete(m_socketContext); + } #endif } @@ -427,7 +431,7 @@ QUrl url = request.url(); if (!url.isValid() || url.toString().contains(QStringLiteral("\r\n"))) { setErrorString(QWebSocket::tr("Invalid URL.")); - Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError); + emitErrorOccurred(QAbstractSocket::ConnectionRefusedError); return; } if (m_pSocket) { @@ -447,7 +451,7 @@ if (resourceName.contains(QStringLiteral("%0D%0A"))) { setRequest(QNetworkRequest()); //clear request setErrorString(QWebSocket::tr("Invalid resource name.")); - Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError); + emitErrorOccurred(QAbstractSocket::ConnectionRefusedError); return; } if (!url.query().isEmpty()) { @@ -467,7 +471,7 @@ const QString message = QWebSocket::tr("SSL Sockets are not supported on this platform."); setErrorString(message); - Q_EMIT q->error(QAbstractSocket::UnsupportedSocketOperationError); + emitErrorOccurred(QAbstractSocket::UnsupportedSocketOperationError); } else { QSslSocket *sslSocket = new QSslSocket(q); m_pSocket = sslSocket; @@ -495,7 +499,7 @@ } else { const QString message = QWebSocket::tr("Out of memory."); setErrorString(message); - Q_EMIT q->error(QAbstractSocket::SocketResourceError); + emitErrorOccurred(QAbstractSocket::SocketResourceError); } } } else @@ -520,13 +524,13 @@ } else { const QString message = QWebSocket::tr("Out of memory."); setErrorString(message); - Q_EMIT q->error(QAbstractSocket::SocketResourceError); + emitErrorOccurred(QAbstractSocket::SocketResourceError); } } else { const QString message = QWebSocket::tr("Unsupported WebSocket scheme: %1").arg(url.scheme()); setErrorString(message); - Q_EMIT q->error(QAbstractSocket::UnsupportedSocketOperationError); + emitErrorOccurred(QAbstractSocket::UnsupportedSocketOperationError); } } } @@ -632,8 +636,8 @@ if (Q_LIKELY(pTcpSocket)) { //pass through signals - QObject::connect(pTcpSocket, &QAbstractSocket::errorOccurred, - q, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error)); + QObjectPrivate::connect(pTcpSocket, &QAbstractSocket::errorOccurred, this, + &QWebSocketPrivate::emitErrorOccurred); #ifndef QT_NO_NETWORKPROXY QObject::connect(pTcpSocket, &QAbstractSocket::proxyAuthenticationRequired, q, &QWebSocket::proxyAuthenticationRequired); @@ -792,7 +796,6 @@ quint64 payloadLength, quint32 maskingKey, bool lastFrame) { - Q_Q(QWebSocket); QByteArray header; bool ok = payloadLength <= 0x7FFFFFFFFFFFFFFFULL; @@ -826,7 +829,7 @@ } } else { setErrorString(QStringLiteral("WebSocket::getHeader: payload too big!")); - Q_EMIT q->error(QAbstractSocket::DatagramTooLargeError); + emitErrorOccurred(QAbstractSocket::DatagramTooLargeError); } return header; @@ -841,7 +844,6 @@ if (Q_UNLIKELY(!m_pSocket) || (state() != QAbstractSocket::ConnectedState)) return payloadWritten; - Q_Q(QWebSocket); const QWebSocketProtocol::OpCode firstOpCode = isBinary ? QWebSocketProtocol::OpCodeBinary : QWebSocketProtocol::OpCodeText; @@ -887,7 +889,7 @@ m_pSocket->flush(); setErrorString(QWebSocket::tr("Error writing bytes to socket: %1.") .arg(m_pSocket->errorString())); - Q_EMIT q->error(QAbstractSocket::NetworkError); + emitErrorOccurred(QAbstractSocket::NetworkError); break; } } @@ -897,7 +899,7 @@ if (Q_UNLIKELY(payloadWritten != data.size())) { setErrorString(QWebSocket::tr("Bytes written %1 != %2.") .arg(payloadWritten).arg(data.size())); - Q_EMIT q->error(QAbstractSocket::NetworkError); + emitErrorOccurred(QAbstractSocket::NetworkError); } return payloadWritten; } @@ -981,7 +983,7 @@ const qint64 maxHeaderLength = MAX_HEADERLINE_LENGTH * MAX_HEADERLINES + endOfHeaderMarker.size(); if (Q_UNLIKELY(byteAvailable > maxHeaderLength)) { setErrorString(QWebSocket::tr("Header is too large")); - Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError); + emitErrorOccurred(QAbstractSocket::ConnectionRefusedError); } return; } @@ -993,7 +995,7 @@ if (Q_UNLIKELY(skippedSize != headerSize)) { setErrorString(QWebSocket::tr("Read handshake request header failed")); - Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError); + emitErrorOccurred(QAbstractSocket::ConnectionRefusedError); return; } @@ -1004,13 +1006,13 @@ if (!parser.parseStatus(status)) { setErrorString(QWebSocket::tr("Read handshake request status failed")); - Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError); + emitErrorOccurred(QAbstractSocket::ConnectionRefusedError); return; } if (!parser.parseHeaders(headers.sliced(endOfStatusIndex + endOfStatusMarker.size()))) { setErrorString(QWebSocket::tr("Parsing handshake request header failed")); - Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError); + emitErrorOccurred(QAbstractSocket::ConnectionRefusedError); return; } @@ -1030,7 +1032,7 @@ setErrorString(QWebSocket::tr("WebSocket server has chosen protocol %1 which has not been " "requested") .arg(protocol)); - Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError); + emitErrorOccurred(QAbstractSocket::ConnectionRefusedError); return; } @@ -1095,7 +1097,7 @@ } else { // handshake failed setErrorString(errorDescription); - Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError); + emitErrorOccurred(QAbstractSocket::ConnectionRefusedError); if (m_pSocket->state() != QAbstractSocket::UnconnectedState) m_pSocket->disconnectFromHost(); } @@ -1143,7 +1145,7 @@ headers); if (handshake.isEmpty()) { m_pSocket->abort(); - Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError); + emitErrorOccurred(QAbstractSocket::ConnectionRefusedError); return; } m_pSocket->write(handshake.toLatin1()); @@ -1552,6 +1554,18 @@ m_pSocket->setReadBufferSize(m_readBufferSize); } +void QWebSocketPrivate::emitErrorOccurred(QAbstractSocket::SocketError error) +{ + Q_Q(QWebSocket); + Q_EMIT q->errorOccurred(error); +#if QT_DEPRECATED_SINCE(6, 5) + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED + Q_EMIT q->error(error); + QT_WARNING_POP +#endif +} + #ifndef Q_OS_WASM /*! \internal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocket_p.h new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocket_p.h --- old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocket_p.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocket_p.h 2023-03-28 16:23:33.000000000 +0200 @@ -75,6 +75,12 @@ QWebSocketProtocol::Version version); ~QWebSocketPrivate() override; + // both constants are taken from the default settings of Apache + // see: http://httpd.apache.org/docs/2.2/mod/core.html#limitrequestfieldsize and + // http://httpd.apache.org/docs/2.2/mod/core.html#limitrequestfields + static constexpr int MAX_HEADERLINE_LENGTH = 8 * 1024; // maximum length of a http request header line + static constexpr int MAX_HEADERLINES = 100; // maximum number of http request header lines + void init(); void abort(); QAbstractSocket::SocketError error() const; @@ -189,6 +195,7 @@ QByteArray generateKey() const; Q_REQUIRED_RESULT qint64 writeFrames(const QList<QByteArray> &frames); Q_REQUIRED_RESULT qint64 writeFrame(const QByteArray &frame); + void emitErrorOccurred(QAbstractSocket::SocketError error); QTcpSocket *m_pSocket; QString m_errorString; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocket_wasm_p.cpp new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocket_wasm_p.cpp --- old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocket_wasm_p.cpp 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocket_wasm_p.cpp 2023-03-28 16:23:33.000000000 +0200 @@ -12,6 +12,8 @@ #include <emscripten/websocket.h> #include <emscripten/val.h> +#include <QHostAddress> + static EM_BOOL q_onWebSocketErrorCallback(int eventType, const EmscriptenWebSocketErrorEvent *e, void *userData) @@ -22,7 +24,7 @@ QWebSocketPrivate *wsp = reinterpret_cast<QWebSocketPrivate *>(userData); Q_ASSERT (wsp); - emit wsp->q_func()->error(wsp->error()); + emit wsp->q_func()->errorOccurred(wsp->error()); return EM_FALSE; } @@ -78,9 +80,12 @@ emscripten_websocket_get_ready_state(m_socketContext, &m_readyState); if (m_readyState == 1) { - result = emscripten_websocket_send_utf8_text(m_socketContext, message.toUtf8()); + QByteArray messageArray = message.toUtf8(); + result = emscripten_websocket_send_utf8_text(m_socketContext, messageArray); if (result < 0) - emit q_func()->error(QAbstractSocket::UnknownSocketError); + emitErrorOccurred(QAbstractSocket::UnknownSocketError); + else + return messageArray.length(); } else qWarning() << "Could not send message. Websocket is not open"; @@ -96,7 +101,9 @@ m_socketContext, const_cast<void *>(reinterpret_cast<const void *>(data.constData())), data.size()); if (result < 0) - emit q_func()->error(QAbstractSocket::UnknownSocketError); + emitErrorOccurred(QAbstractSocket::UnknownSocketError); + else + return data.size(); } else qWarning() << "Could not send message. Websocket is not open"; @@ -113,7 +120,7 @@ emscripten_websocket_get_ready_state(m_socketContext, &m_readyState); - if (m_readyState == 1) { + if (m_readyState == 1 || m_readyState == 0) { emscripten_websocket_close(m_socketContext, (int)closeCode, reason.toUtf8()); } setSocketState(QAbstractSocket::UnconnectedState); @@ -126,12 +133,11 @@ { Q_UNUSED(mask); Q_UNUSED(options) - Q_Q(QWebSocket); emscripten_websocket_get_ready_state(m_socketContext, &m_readyState); if ((m_readyState == 1 || m_readyState == 3) && m_socketContext != 0) { - emit q->error(QAbstractSocket::OperationError); + emitErrorOccurred(QAbstractSocket::OperationError); return; } @@ -146,15 +152,27 @@ if (!url.isValid() || url.toString().contains(QStringLiteral("\r\n"))) { setErrorString(QWebSocket::tr("Connection refused")); - Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError); + + emitErrorOccurred(QAbstractSocket::ConnectionRefusedError); + return; } - if (isSecureContext && url.scheme() == QStringLiteral("ws")) { - const QString message = + // exception for localhost/127.0.0.1/[::1] + // localhost has special privledges + + QHostAddress hostAddress(url.host()); + + bool hostAddressIsLocal = (hostAddress == QHostAddress::LocalHost + || hostAddress == QHostAddress::LocalHostIPv6); + + if (url.host() != QStringLiteral("localhost") && !hostAddressIsLocal) { + if (isSecureContext && url.scheme() == QStringLiteral("ws")) { + const QString message = QWebSocket::tr("Unsupported WebSocket scheme: %1").arg(url.scheme()); - setErrorString(message); - emit q->error(QAbstractSocket::UnsupportedSocketOperationError); - return; + setErrorString(message); + emitErrorOccurred(QAbstractSocket::UnsupportedSocketOperationError); + return; + } } EmscriptenWebSocketCreateAttributes attr; @@ -187,7 +205,7 @@ if (m_socketContext <= 0) { // m_readyState might not be changed yet // error - emit q->error(QAbstractSocket::UnknownSocketError); + emitErrorOccurred(QAbstractSocket::UnknownSocketError); return; } @@ -239,7 +257,7 @@ if (!emCloseEvent->wasClean) { m_errorString = QStringLiteral("The remote host closed the connection"); - emit q->error(error()); + emit q->errorOccurred(error()); } emscripten_websocket_get_ready_state(m_socketContext, &m_readyState); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocketframe.cpp new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocketframe.cpp --- old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocketframe.cpp 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocketframe.cpp 2023-03-28 16:23:33.000000000 +0200 @@ -212,8 +212,7 @@ return; default: - Q_UNREACHABLE(); - return; + Q_UNREACHABLE_RETURN(); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocketprotocol.h new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocketprotocol.h --- old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocketprotocol.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocketprotocol.h 2023-03-28 16:23:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QWEBSOCKETPROTOCOL_H #define QWEBSOCKETPROTOCOL_H +#if 0 +# pragma qt_class(QWebSocketProtocol) +#endif + #include <QtCore/qglobal.h> #include "QtWebSockets/qwebsockets_global.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocketserver.cpp new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocketserver.cpp --- old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocketserver.cpp 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocketserver.cpp 2023-03-28 16:23:33.000000000 +0200 @@ -46,7 +46,7 @@ */ /*! - \page echoserver.html example + \page echoserver.html \title WebSocket server example \brief A sample WebSocket server echoing back messages sent to it. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocketserver.h new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocketserver.h --- old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocketserver.h 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocketserver.h 2023-03-28 16:23:33.000000000 +0200 @@ -16,7 +16,7 @@ #include <QtNetwork/QSslError> #endif -#if QT_HAS_INCLUDE(<chrono>) +#if __has_include(<chrono>) #include <chrono> #endif @@ -54,7 +54,7 @@ void setMaxPendingConnections(int numConnections); int maxPendingConnections() const; -#if QT_HAS_INCLUDE(<chrono>) || defined(Q_CLANG_QDOC) +#if __has_include(<chrono>) || defined(Q_QDOC) void setHandshakeTimeout(std::chrono::milliseconds msec) { setHandshakeTimeout(int(msec.count())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocketserver_p.cpp new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocketserver_p.cpp --- old/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocketserver_p.cpp 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/src/websockets/qwebsocketserver_p.cpp 2023-03-28 16:23:33.000000000 +0200 @@ -21,12 +21,6 @@ QT_BEGIN_NAMESPACE -//both constants are taken from the default settings of Apache -//see: http://httpd.apache.org/docs/2.2/mod/core.html#limitrequestfieldsize and -//http://httpd.apache.org/docs/2.2/mod/core.html#limitrequestfields -const int MAX_HEADERLINE_LENGTH = 8 * 1024; //maximum length of a http request header line -const int MAX_HEADERLINES = 100; //maximum number of http request header lines - /*! \internal */ @@ -455,7 +449,8 @@ if (endOfHeaderIndex < 0) { //then we don't have our header complete yet //check that no one is trying to exhaust our virtual memory - const qint64 maxHeaderLength = MAX_HEADERLINE_LENGTH * MAX_HEADERLINES + endOfHeaderMarker.size(); + const qint64 maxHeaderLength = QWebSocketPrivate::MAX_HEADERLINE_LENGTH + * QWebSocketPrivate::MAX_HEADERLINES + endOfHeaderMarker.size(); if (Q_UNLIKELY(byteAvailable > maxHeaderLength)) { pTcpSocket->close(); setError(QWebSocketProtocol::CloseCodeTooMuchData, @@ -490,7 +485,7 @@ } QWebSocketHandshakeRequest request(pTcpSocket->peerPort(), isSecure); - request.readHandshake(header, MAX_HEADERLINE_LENGTH); + request.readHandshake(header, QWebSocketPrivate::MAX_HEADERLINE_LENGTH); if (request.isValid()) { QWebSocketCorsAuthenticator corsAuthenticator(request.origin()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/tests/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/tests/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from tests.pro. if(QT_BUILD_STANDALONE_TESTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/auto/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/tests/auto/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/tests/auto/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/auto/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + add_subdirectory(cmake) add_subdirectory(websockets) if(TARGET Qt::Quick) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/auto/cmake/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/tests/auto/cmake/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/tests/auto/cmake/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/auto/cmake/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # This is an automatic test for the CMake configuration files. # To run it manually, # 1) mkdir build # Create a build directory diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/auto/qml/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/tests/auto/qml/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/tests/auto/qml/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/auto/qml/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qml.pro. if(NOT UIKIT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/auto/qml/qmlwebsockets/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/tests/auto/qml/qmlwebsockets/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/tests/auto/qml/qmlwebsockets/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/auto/qml/qmlwebsockets/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qmlwebsockets.pro. ##################################################################### @@ -12,7 +15,7 @@ QMLTEST SOURCES tst_qmlwebsockets.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui TESTDATA ${test_data} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from websockets.pro. add_subdirectory(qwebsocketcorsauthenticator) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/dataprocessor/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/dataprocessor/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/dataprocessor/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/dataprocessor/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from dataprocessor.pro. if(NOT QT_FEATURE_private_tests) @@ -11,7 +14,7 @@ qt_internal_add_test(tst_dataprocessor SOURCES tst_dataprocessor.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::WebSocketsPrivate ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/handshakerequest/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/handshakerequest/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/handshakerequest/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/handshakerequest/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from handshakerequest.pro. if(NOT QT_FEATURE_private_tests) @@ -13,7 +16,6 @@ tst_handshakerequest.cpp LIBRARIES Qt::NetworkPrivate - PUBLIC_LIBRARIES Qt::WebSocketsPrivate ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/handshakeresponse/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/handshakeresponse/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/handshakeresponse/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/handshakeresponse/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from handshakeresponse.pro. if(NOT QT_FEATURE_private_tests) @@ -13,7 +16,6 @@ tst_handshakeresponse.cpp LIBRARIES Qt::NetworkPrivate - PUBLIC_LIBRARIES Qt::WebSocketsPrivate ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qdefaultmaskgenerator.pro. if(NOT QT_FEATURE_private_tests) @@ -11,7 +14,7 @@ qt_internal_add_test(tst_defaultmaskgenerator SOURCES tst_defaultmaskgenerator.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::WebSocketsPrivate ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/qwebsocket/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/qwebsocket/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/qwebsocket/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/qwebsocket/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qwebsocket.pro. ##################################################################### @@ -7,7 +10,7 @@ qt_internal_add_test(tst_qwebsocket SOURCES tst_qwebsocket.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::WebSockets ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/qwebsocketcorsauthenticator/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/qwebsocketcorsauthenticator/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/qwebsocketcorsauthenticator/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/qwebsocketcorsauthenticator/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qwebsocketcorsauthenticator.pro. ##################################################################### @@ -7,7 +10,7 @@ qt_internal_add_test(tst_qwebsocketcorsauthenticator SOURCES tst_qwebsocketcorsauthenticator.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::WebSockets ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/qwebsocketserver/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/qwebsocketserver/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/qwebsocketserver/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/qwebsocketserver/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qwebsocketserver.pro. ##################################################################### @@ -7,7 +10,7 @@ qt_internal_add_test(tst_qwebsocketserver SOURCES tst_qwebsocketserver.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::WebSockets ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp --- old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp 2023-03-28 16:23:33.000000000 +0200 @@ -256,7 +256,7 @@ server.setHandshakeTimeout(64); QCOMPARE(server.handshakeTimeoutMS(), 64); -#if QT_HAS_INCLUDE(<chrono>) +#if __has_include(<chrono>) auto expected = std::chrono::milliseconds(64); QCOMPARE(server.handshakeTimeout(), expected); @@ -811,7 +811,7 @@ QCOMPARE(secureServerConnectionSpy.size(), 0); QWebSocket secureSocket; - connect(&secureSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error), + connect(&secureSocket, &QWebSocket::errorOccurred, [](QAbstractSocket::SocketError error) { // This shouldn't print but it's useful for debugging when/if it does. qDebug() << "Error occurred in the client:" << error; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/websocketframe/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/websocketframe/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/websocketframe/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/websocketframe/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from websocketframe.pro. if(NOT QT_FEATURE_private_tests) @@ -11,7 +14,7 @@ qt_internal_add_test(tst_websocketframe SOURCES tst_websocketframe.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::WebSocketsPrivate ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/websocketprotocol/CMakeLists.txt new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/websocketprotocol/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/websocketprotocol/CMakeLists.txt 2023-03-12 03:16:37.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.5.0/tests/auto/websockets/websocketprotocol/CMakeLists.txt 2023-03-28 16:23:33.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from websocketprotocol.pro. if(NOT QT_FEATURE_private_tests) @@ -11,7 +14,7 @@ qt_internal_add_test(tst_websocketprotocol SOURCES tst_websocketprotocol.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::WebSocketsPrivate )
