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 2022-06-20 15:37:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-websockets (Old) and /work/SRC/openSUSE:Factory/.qt6-websockets.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-websockets" Mon Jun 20 15:37:58 2022 rev:7 rq:983760 version:6.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-websockets/qt6-websockets.changes 2022-04-20 16:56:43.102588768 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-websockets.new.1548/qt6-websockets.changes 2022-06-20 15:38:41.566983862 +0200 @@ -1,0 +2,6 @@ +Fri Jun 17 15:15:48 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.3.1: + * https://www.qt.io/blog/qt-6.3.1-released + +------------------------------------------------------------------- Old: ---- qtwebsockets-everywhere-src-6.3.0.tar.xz New: ---- qtwebsockets-everywhere-src-6.3.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-websockets.spec ++++++ --- /var/tmp/diff_new_pack.QlEO6l/_old 2022-06-20 15:38:42.222984822 +0200 +++ /var/tmp/diff_new_pack.QlEO6l/_new 2022-06-20 15:38:42.226984827 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.3.0 +%define real_version 6.3.1 %define short_version 6.3 %define tar_name qtwebsockets-everywhere-src %define tar_suffix %{nil} @@ -27,13 +27,14 @@ %endif # Name: qt6-websockets%{?pkg_suffix} -Version: 6.3.0 +Version: 6.3.1 Release: 0 Summary: Qt 6 WebSockets library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-websockets-rpmlintrc +BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel BuildRequires: qt6-network-private-devel BuildRequires: qt6-qml-private-devel @@ -126,6 +127,7 @@ %{_qt6_libdir}/libQt6WebSockets.so %{_qt6_metatypesdir}/qt6websockets_*_metatypes.json %{_qt6_mkspecsdir}/modules/qt_lib_websockets.pri +%{_qt6_pkgconfigdir}/Qt6WebSockets.pc %exclude %{_qt6_includedir}/QtWebSockets/%{real_version}/ %files private-devel ++++++ qtwebsockets-everywhere-src-6.3.0.tar.xz -> qtwebsockets-everywhere-src-6.3.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/.cmake.conf new/qtwebsockets-everywhere-src-6.3.1/.cmake.conf --- old/qtwebsockets-everywhere-src-6.3.0/.cmake.conf 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/.cmake.conf 2022-06-08 05:44:36.000000000 +0200 @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.3.0") -set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") +set(QT_REPO_MODULE_VERSION "6.3.1") +set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/.prev_CMakeLists.txt new/qtwebsockets-everywhere-src-6.3.1/.prev_CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.3.0/.prev_CMakeLists.txt 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/.prev_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -# Generated from qtwebsockets.pro. - -cmake_minimum_required(VERSION 3.15.0) - -include(.cmake.conf) -project(QtWebSockets - VERSION "${QT_REPO_MODULE_VERSION}" - DESCRIPTION "Qt WebSockets Libraries" - HOMEPAGE_URL "https://qt.io/" - LANGUAGES CXX C -) - -find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) -find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) - -if(NOT TARGET Qt::Network) - message(NOTICE "Skipping the build as the condition \"TARGET Qt::Network\" is not met.") - return() -endif() -qt_build_repo() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/.tag new/qtwebsockets-everywhere-src-6.3.1/.tag --- old/qtwebsockets-everywhere-src-6.3.0/.tag 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/.tag 2022-06-08 05:44:36.000000000 +0200 @@ -1 +1 @@ -d70576339842499c76c86444667500fa7244aa1a +5e0691b7589fb9b5e97048208617e32070334e6c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/dependencies.yaml new/qtwebsockets-everywhere-src-6.3.1/dependencies.yaml --- old/qtwebsockets-everywhere-src-6.3.0/dependencies.yaml 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/dependencies.yaml 2022-06-08 05:44:36.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 9554d315aa74eaba1726405ee09117e2ebc6111f + ref: 8483dcde90f40cdfd0a0ec4245b03610b46b6cae required: true ../qtdeclarative: - ref: 2a45651292f45eca3d1f9fa518a8ebfcac647f18 + ref: 47ef121e1a436fd46129cdaa1a4398c82045eb97 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qdefaultmaskgenerator_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/QtWebSockets/private/qdefaultmaskgenerator_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qdefaultmaskgenerator_p.h 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/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.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qsslserver_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/QtWebSockets/private/qsslserver_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qsslserver_p.h 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/QtWebSockets/private/qsslserver_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qsslserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocket_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocket_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocket_p.h 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/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.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/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.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocketdataprocessor_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocketdataprocessor_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocketdataprocessor_p.h 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/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.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocketframe_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocketframe_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocketframe_p.h 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/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.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsockethandshakerequest_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsockethandshakerequest_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsockethandshakerequest_p.h 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/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.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/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.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocketprotocol_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocketprotocol_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocketprotocol_p.h 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/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.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocketserver_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocketserver_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.0/QtWebSockets/private/qwebsocketserver_p.h 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.0/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.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qdefaultmaskgenerator_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qdefaultmaskgenerator_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qdefaultmaskgenerator_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qdefaultmaskgenerator_p.h 2022-06-08 05:44:36.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qdefaultmaskgenerator_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qsslserver_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qsslserver_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qsslserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qsslserver_p.h 2022-06-08 05:44:36.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qsslserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocket_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocket_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocket_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocket_p.h 2022-06-08 05:44:36.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocket_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 2022-06-08 05:44:36.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocketcorsauthenticator_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketdataprocessor_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketdataprocessor_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketdataprocessor_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketdataprocessor_p.h 2022-06-08 05:44:36.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocketdataprocessor_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketframe_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketframe_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketframe_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketframe_p.h 2022-06-08 05:44:36.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocketframe_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsockethandshakerequest_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsockethandshakerequest_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsockethandshakerequest_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsockethandshakerequest_p.h 2022-06-08 05:44:36.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsockethandshakerequest_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h 2022-06-08 05:44:36.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsockethandshakeresponse_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketprotocol_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketprotocol_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketprotocol_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketprotocol_p.h 2022-06-08 05:44:36.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocketprotocol_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketserver_p.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketserver_p.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/6.3.1/QtWebSockets/private/qwebsocketserver_p.h 2022-06-08 05:44:36.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocketserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/qtwebsocketsversion.h new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/qtwebsocketsversion.h --- old/qtwebsockets-everywhere-src-6.3.0/include/QtWebSockets/qtwebsocketsversion.h 2022-04-06 19:56:41.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/include/QtWebSockets/qtwebsocketsversion.h 2022-06-09 02:14:40.000000000 +0200 @@ -2,8 +2,8 @@ #ifndef QT_QTWEBSOCKETS_VERSION_H #define QT_QTWEBSOCKETS_VERSION_H -#define QTWEBSOCKETS_VERSION_STR "6.3.0" +#define QTWEBSOCKETS_VERSION_STR "6.3.1" -#define QTWEBSOCKETS_VERSION 0x060300 +#define QTWEBSOCKETS_VERSION 0x060301 #endif // QT_QTWEBSOCKETS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/src/imports/qmlwebsockets/.prev_CMakeLists.txt new/qtwebsockets-everywhere-src-6.3.1/src/imports/qmlwebsockets/.prev_CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.3.0/src/imports/qmlwebsockets/.prev_CMakeLists.txt 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/src/imports/qmlwebsockets/.prev_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -# Generated from qmlwebsockets.pro. - -##################################################################### -## qmlwebsockets Plugin: -##################################################################### - -qt_internal_add_qml_module(qmlwebsockets - URI "QtWebSockets" - VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" - CLASSNAME QtWebSocketsDeclarativeModule - SKIP_TYPE_REGISTRATION - SOURCES - qmlwebsockets_plugin.cpp qmlwebsockets_plugin.h - qqmlwebsocket.cpp qqmlwebsocket.h - qqmlwebsocketserver.cpp qqmlwebsocketserver.h - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::QmlPrivate - Qt::WebSockets -) - -#### Keys ignored in scope 1:.:.:qmlwebsockets.pro:<TRUE>: -# IMPORT_VERSION = "1.$$QT_MINOR_VERSION" -# OTHER_FILES = "qmldir" -# TARGETPATH = "QtWebSockets" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/tests/.prev_CMakeLists.txt new/qtwebsockets-everywhere-src-6.3.1/tests/.prev_CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.3.0/tests/.prev_CMakeLists.txt 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/tests/.prev_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -# Generated from tests.pro. - -if(QT_BUILD_STANDALONE_TESTS) - # Add qt_find_package calls for extra dependencies that need to be found when building - # the standalone tests here. -endif() -qt_build_tests() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/tests/auto/.prev_CMakeLists.txt new/qtwebsockets-everywhere-src-6.3.1/tests/auto/.prev_CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.3.0/tests/auto/.prev_CMakeLists.txt 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/tests/auto/.prev_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -# Generated from auto.pro. - -add_subdirectory(cmake) -add_subdirectory(websockets) -if(TARGET Qt::Quick) - add_subdirectory(qml) -endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/tests/auto/qml/qmlwebsockets/CMakeLists.txt new/qtwebsockets-everywhere-src-6.3.1/tests/auto/qml/qmlwebsockets/CMakeLists.txt --- old/qtwebsockets-everywhere-src-6.3.0/tests/auto/qml/qmlwebsockets/CMakeLists.txt 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/tests/auto/qml/qmlwebsockets/CMakeLists.txt 2022-06-08 05:44:36.000000000 +0200 @@ -3,6 +3,10 @@ ##################################################################### ## tst_qmlwebsockets Test: ##################################################################### +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.qml) +list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qmlwebsockets QMLTEST @@ -10,6 +14,7 @@ tst_qmlwebsockets.cpp PUBLIC_LIBRARIES Qt::Gui + TESTDATA ${test_data} ) #### Keys ignored in scope 1:.:.:qmlwebsockets.pro:<TRUE>: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp new/qtwebsockets-everywhere-src-6.3.1/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp --- old/qtwebsockets-everywhere-src-6.3.0/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp 2022-06-08 05:44:36.000000000 +0200 @@ -782,6 +782,7 @@ socket.setProxy(proxy); QCOMPARE(socket.proxy(), proxy); } +#endif // QT_NO_NETWORKPROXY void tst_QWebSocket::overlongCloseReason() { @@ -884,8 +885,6 @@ QTRY_COMPARE(maxAllowedIncomingMessageSize, socket.maxAllowedIncomingMessageSize()); } -#endif // QT_NO_NETWORKPROXY - void tst_QWebSocket::customHeader() { QTcpServer server; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.3.0/tests/auto/websockets/qwebsocketserver/BLACKLIST new/qtwebsockets-everywhere-src-6.3.1/tests/auto/websockets/qwebsocketserver/BLACKLIST --- old/qtwebsockets-everywhere-src-6.3.0/tests/auto/websockets/qwebsocketserver/BLACKLIST 2022-04-05 23:42:03.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.3.1/tests/auto/websockets/qwebsocketserver/BLACKLIST 2022-06-08 05:44:36.000000000 +0200 @@ -1,4 +1,5 @@ -# See qtbase/src/testlib/qtestblacklist.cpp for format -#QTBUG-101333 -[tst_handleConnection] -qnx +# QTBUG-102713 +[tst_scheme] +android +[tst_handshakeTimeout] +android