Hello community, here is the log from the commit of package libqt5-qtwebsockets for openSUSE:Factory checked in at 2019-06-28 16:31:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebsockets (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebsockets" Fri Jun 28 16:31:24 2019 rev:30 rq:711205 version:5.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebsockets/libqt5-qtwebsockets.changes 2019-04-26 22:54:12.829324272 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new.4615/libqt5-qtwebsockets.changes 2019-06-28 16:31:25.542377390 +0200 @@ -1,0 +2,23 @@ +Wed Jun 19 11:26:35 UTC 2019 - fab...@ritter-vogt.de + +- Update to 5.13.0: + * New bugfix release + * No changelog available + * For more details about Qt 5.13 please see: + * http://code.qt.io/cgit/qt/qtwebsockets.git/plain/dist/changes-5.13.0/?h=5.13 + +------------------------------------------------------------------- +Tue Jun 4 07:25:39 UTC 2019 - fab...@ritter-vogt.de + +- Update to 5.13.0-rc: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Mon Apr 29 09:17:22 UTC 2019 - fab...@ritter-vogt.de + +- Update to 5.13.0-beta2: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- @@ -9,0 +33,8 @@ +Thu Mar 21 10:26:47 UTC 2019 - fab...@ritter-vogt.de + +- Update to 5.13.0-beta1: + * New feature release + * For more details about Qt 5.13 please see: + * http://code.qt.io/cgit/qt/qtwebsockets.git/plain/dist/changes-5.13.0/?h=5.13 + +------------------------------------------------------------------- @@ -389,0 +421 @@ + Old: ---- qtwebsockets-everywhere-src-5.12.3.tar.xz New: ---- qtwebsockets-everywhere-src-5.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebsockets.spec ++++++ --- /var/tmp/diff_new_pack.FWYguz/_old 2019-06-28 16:31:26.202378388 +0200 +++ /var/tmp/diff_new_pack.FWYguz/_new 2019-06-28 16:31:26.206378393 +0200 @@ -21,17 +21,17 @@ %define libname libQt5WebSockets5 Name: libqt5-qtwebsockets -Version: 5.12.3 +Version: 5.13.0 Release: 0 Summary: Qt 5 WebSockets Library License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: Development/Libraries/X11 Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.12.3 -%define so_version 5.12.3 -%define tar_version qtwebsockets-everywhere-src-5.12.3 -Source: https://download.qt.io/official_releases/qt/5.12/%{real_version}/submodules/%{tar_version}.tar.xz +%define real_version 5.13.0 +%define so_version 5.13.0 +%define tar_version qtwebsockets-everywhere-src-5.13.0 +Source: https://download.qt.io/official_releases/qt/5.13/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf BuildRequires: libQt5Core-private-headers-devel >= %{version} BuildRequires: pkgconfig(Qt5Core) >= %{version} ++++++ qtwebsockets-everywhere-src-5.12.3.tar.xz -> qtwebsockets-everywhere-src-5.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.12.3/.qmake.conf new/qtwebsockets-everywhere-src-5.13.0/.qmake.conf --- old/qtwebsockets-everywhere-src-5.12.3/.qmake.conf 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/.qmake.conf 2019-05-03 09:14:19.000000000 +0200 @@ -3,4 +3,4 @@ CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.12.3 +MODULE_VERSION = 5.13.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.12.3/.tag new/qtwebsockets-everywhere-src-5.13.0/.tag --- old/qtwebsockets-everywhere-src-5.12.3/.tag 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/.tag 2019-05-03 09:14:19.000000000 +0200 @@ -1 +1 @@ -c8704b3dbcfecd774244300943b1c63e2bf9841f +b7d892b97697f90b3669dab56358a48fb3542f68 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.12.3/dist/changes-5.13.0 new/qtwebsockets-everywhere-src-5.13.0/dist/changes-5.13.0 --- old/qtwebsockets-everywhere-src-5.12.3/dist/changes-5.13.0 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-5.13.0/dist/changes-5.13.0 2019-05-03 09:14:19.000000000 +0200 @@ -0,0 +1,18 @@ +Qt 5.13 introduces many new features and improvements as well as bugfixes +over the 5.12.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.13 series is binary compatible with the 5.12.x series. +Applications compiled for 5.12 will continue to run with 5.13. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.12.3/examples/websockets/doc/echoserver.qdoc new/qtwebsockets-everywhere-src-5.13.0/examples/websockets/doc/echoserver.qdoc --- old/qtwebsockets-everywhere-src-5.12.3/examples/websockets/doc/echoserver.qdoc 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/examples/websockets/doc/echoserver.qdoc 2019-05-03 09:14:19.000000000 +0200 @@ -59,7 +59,7 @@ sends back the messages it receives, using the \l {Qt WebSockets}{WebSocket} API. If your web browser supports \l {Qt WebSockets}{WebSocket}, you can also use it - to open the \l {echoserver/echoclient.html}{echoclient.html} file, and operate + to open the \c {echoserver/echoclient.html}{echoclient.html} file, and operate like the following screenshot. \image echoclient-html-example.png Screenshot of the HTML version of Echo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qdefaultmaskgenerator_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.3/QtWebSockets/private/qdefaultmaskgenerator_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qdefaultmaskgenerator_p.h 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.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-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qsslserver_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.3/QtWebSockets/private/qsslserver_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qsslserver_p.h 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.3/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-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocket_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocket_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocket_p.h 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.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-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocketcorsauthenticator_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocketcorsauthenticator_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.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-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocketdataprocessor_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocketdataprocessor_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocketdataprocessor_p.h 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.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-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocketframe_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocketframe_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocketframe_p.h 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.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-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsockethandshakerequest_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsockethandshakerequest_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsockethandshakerequest_p.h 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.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-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsockethandshakeresponse_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsockethandshakeresponse_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsockethandshakeresponse_p.h 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.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-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocketprotocol_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocketprotocol_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocketprotocol_p.h 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.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-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocketserver_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocketserver_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.12.3/QtWebSockets/private/qwebsocketserver_p.h 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.12.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-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qdefaultmaskgenerator_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qdefaultmaskgenerator_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qdefaultmaskgenerator_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qdefaultmaskgenerator_p.h 2019-05-03 09:14:19.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-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qsslserver_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qsslserver_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qsslserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qsslserver_p.h 2019-05-03 09:14:19.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-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocket_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocket_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocket_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocket_p.h 2019-05-03 09:14:19.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-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 2019-05-03 09:14:19.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-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketdataprocessor_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketdataprocessor_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketdataprocessor_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketdataprocessor_p.h 2019-05-03 09:14:19.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-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketframe_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketframe_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketframe_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketframe_p.h 2019-05-03 09:14:19.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-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsockethandshakerequest_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsockethandshakerequest_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsockethandshakerequest_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsockethandshakerequest_p.h 2019-05-03 09:14:19.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-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h 2019-05-03 09:14:19.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-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketprotocol_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketprotocol_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketprotocol_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketprotocol_p.h 2019-05-03 09:14:19.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-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketserver_p.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketserver_p.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/5.13.0/QtWebSockets/private/qwebsocketserver_p.h 2019-05-03 09:14:19.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-5.12.3/include/QtWebSockets/qtwebsocketsversion.h new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/qtwebsocketsversion.h --- old/qtwebsockets-everywhere-src-5.12.3/include/QtWebSockets/qtwebsocketsversion.h 2019-04-11 20:26:45.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/include/QtWebSockets/qtwebsocketsversion.h 2019-06-17 14:33:27.000000000 +0200 @@ -2,8 +2,8 @@ #ifndef QT_QTWEBSOCKETS_VERSION_H #define QT_QTWEBSOCKETS_VERSION_H -#define QTWEBSOCKETS_VERSION_STR "5.12.3" +#define QTWEBSOCKETS_VERSION_STR "5.13.0" -#define QTWEBSOCKETS_VERSION 0x050C03 +#define QTWEBSOCKETS_VERSION 0x050D00 #endif // QT_QTWEBSOCKETS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.12.3/src/imports/qmlwebsockets/plugins.qmltypes new/qtwebsockets-everywhere-src-5.13.0/src/imports/qmlwebsockets/plugins.qmltypes --- old/qtwebsockets-everywhere-src-5.12.3/src/imports/qmlwebsockets/plugins.qmltypes 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/src/imports/qmlwebsockets/plugins.qmltypes 2019-05-03 09:14:19.000000000 +0200 @@ -4,7 +4,7 @@ // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebSockets 1.1' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebSockets 1.13' Module { dependencies: [] @@ -38,7 +38,7 @@ } Signal { name: "statusChanged" - Parameter { name: "status"; type: "Status" } + Parameter { name: "status"; type: "QQmlWebSocket::Status" } } Signal { name: "activeChanged" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.12.3/src/imports/qmlwebsockets/qmlwebsockets.pro new/qtwebsockets-everywhere-src-5.13.0/src/imports/qmlwebsockets/qmlwebsockets.pro --- old/qtwebsockets-everywhere-src-5.12.3/src/imports/qmlwebsockets/qmlwebsockets.pro 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/src/imports/qmlwebsockets/qmlwebsockets.pro 2019-05-03 09:14:19.000000000 +0200 @@ -12,6 +12,6 @@ OTHER_FILES += qmldir -IMPORT_VERSION = 1.1 +IMPORT_VERSION = 1.$$QT_MINOR_VERSION load(qml_plugin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.12.3/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp new/qtwebsockets-everywhere-src-5.13.0/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp --- old/qtwebsockets-everywhere-src-5.12.3/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp 2019-05-03 09:14:19.000000000 +0200 @@ -55,6 +55,9 @@ qmlRegisterType<QQmlWebSocket>(uri, 1 /*major*/, 0 /*minor*/, "WebSocket"); qmlRegisterType<QQmlWebSocket, 1>(uri, 1 /*major*/, 1 /*minor*/, "WebSocket"); qmlRegisterType<QQmlWebSocketServer>(uri, 1 /*major*/, 0 /*minor*/, "WebSocketServer"); + + // Auto-increment the import to stay in sync with ALL future QtQuick minor versions + qmlRegisterModule(uri, 1, QT_VERSION_MINOR); } QT_END_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.12.3/src/imports/qmlwebsockets/qqmlwebsocket.h new/qtwebsockets-everywhere-src-5.13.0/src/imports/qmlwebsockets/qqmlwebsocket.h --- old/qtwebsockets-everywhere-src-5.12.3/src/imports/qmlwebsockets/qqmlwebsocket.h 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/src/imports/qmlwebsockets/qqmlwebsocket.h 2019-05-03 09:14:19.000000000 +0200 @@ -88,7 +88,7 @@ Q_SIGNALS: void textMessageReceived(QString message); Q_REVISION(1) void binaryMessageReceived(QByteArray message); - void statusChanged(Status status); + void statusChanged(QQmlWebSocket::Status status); void activeChanged(bool isActive); void errorStringChanged(QString errorString); void urlChanged(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.12.3/src/websockets/doc/src/index.qdoc new/qtwebsockets-everywhere-src-5.13.0/src/websockets/doc/src/index.qdoc --- old/qtwebsockets-everywhere-src-5.12.3/src/websockets/doc/src/index.qdoc 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/src/websockets/doc/src/index.qdoc 2019-05-03 09:14:19.000000000 +0200 @@ -51,9 +51,9 @@ To import the QML types into your application, use the following import statement in your .qml file: - \code - import QtWebSockets 1.0 - \endcode + \qml \QtMinorVersion + import QtWebSockets 1.\1 + \endqml To link against the module, add this line to your qmake .pro file: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.12.3/src/websockets/doc/src/qtwebsockets-module.qdoc new/qtwebsockets-everywhere-src-5.13.0/src/websockets/doc/src/qtwebsockets-module.qdoc --- old/qtwebsockets-everywhere-src-5.12.3/src/websockets/doc/src/qtwebsockets-module.qdoc 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/src/websockets/doc/src/qtwebsockets-module.qdoc 2019-05-03 09:14:19.000000000 +0200 @@ -48,16 +48,16 @@ */ /*! - \qmlmodule QtWebSockets 1.1 + \qmlmodule QtWebSockets 1.\QtMinorVersion \title Qt WebSockets QML Types \ingroup qmlmodules \brief Provides QML types for WebSocket-based communication. The QML types are accessed by using: - \code - import QtWebSockets 1.1 - \endcode + \qml \QtMinorVersion + import QtWebSockets 1.\1 + \endqml \note Prior to Qt 5.5, the import statement was \c{import Qt.WebSockets 1.0} (notice the dot between \c Qt and \c WebSockets). The old statement is still diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.12.3/src/websockets/qwebsocket_p.cpp new/qtwebsockets-everywhere-src-5.13.0/src/websockets/qwebsocket_p.cpp --- old/qtwebsockets-everywhere-src-5.12.3/src/websockets/qwebsocket_p.cpp 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/src/websockets/qwebsocket_p.cpp 2019-05-03 09:14:19.000000000 +0200 @@ -436,6 +436,7 @@ sslSocket->ignoreSslErrors(m_configuration.m_ignoredSslErrors); #ifndef QT_NO_NETWORKPROXY sslSocket->setProxy(m_configuration.m_proxy); + m_pSocket->setProtocolTag(QStringLiteral("https")); #endif sslSocket->connectToHostEncrypted(url.host(), quint16(url.port(443))); } else { @@ -458,6 +459,7 @@ setSocketState(QAbstractSocket::ConnectingState); #ifndef QT_NO_NETWORKPROXY m_pSocket->setProxy(m_configuration.m_proxy); + m_pSocket->setProtocolTag(QStringLiteral("http")); #endif m_pSocket->connectToHost(url.host(), quint16(url.port(80))); } else { @@ -965,7 +967,7 @@ case ReadingStatusState: if (!pSocket->canReadLine()) return; - m_statusLine = pSocket->readLine(); + m_statusLine = pSocket->readLine().trimmed(); if (Q_UNLIKELY(!parseStatusLine(m_statusLine, &m_httpMajorVersion, &m_httpMinorVersion, &m_httpStatusCode, &m_httpStatusMessage))) { errorDescription = QWebSocket::tr("Invalid statusline in response: %1.").arg(QString::fromLatin1(m_statusLine)); break; @@ -1449,6 +1451,7 @@ m_pSocket->setReadBufferSize(m_readBufferSize); } +#ifndef Q_OS_WASM /*! \internal */ @@ -1457,5 +1460,6 @@ return (m_pSocket && m_pSocket->isValid() && (m_socketState == QAbstractSocket::ConnectedState)); } +#endif QT_END_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.12.3/src/websockets/qwebsocket_wasm_p.cpp new/qtwebsockets-everywhere-src-5.13.0/src/websockets/qwebsocket_wasm_p.cpp --- old/qtwebsockets-everywhere-src-5.12.3/src/websockets/qwebsocket_wasm_p.cpp 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/src/websockets/qwebsocket_wasm_p.cpp 2019-05-03 09:14:19.000000000 +0200 @@ -187,3 +187,9 @@ socketContext.set("onmessage", val::module_property("QWebSocketPrivate_onIncomingMessageCallback")); socketContext.set("data-context", val(quintptr(reinterpret_cast<void *>(this)))); } + +bool QWebSocketPrivate::isValid() const +{ + return (!socketContext.isUndefined() && + (m_socketState == QAbstractSocket::ConnectedState)); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.12.3/src/websockets/qwebsocketserver_p.cpp new/qtwebsockets-everywhere-src-5.13.0/src/websockets/qwebsocketserver_p.cpp --- old/qtwebsockets-everywhere-src-5.12.3/src/websockets/qwebsocketserver_p.cpp 2019-04-02 10:49:33.000000000 +0200 +++ new/qtwebsockets-everywhere-src-5.13.0/src/websockets/qwebsocketserver_p.cpp 2019-05-03 09:14:19.000000000 +0200 @@ -416,7 +416,9 @@ //For Safari, the handshake is delivered at once //FIXME: For FireFox, the readyRead signal is never emitted //This is a bug in FireFox (see https://bugzilla.mozilla.org/show_bug.cgi?id=594502) - if (!pTcpSocket->canReadLine()) { + + // According to RFC822 the body is separated from the headers by a null line (CRLF) + if (!pTcpSocket->peek(pTcpSocket->bytesAvailable()).endsWith(QByteArrayLiteral("\r\n\r\n"))) { return; } disconnect(pTcpSocket, &QTcpSocket::readyRead,