Hello community, here is the log from the commit of package libqt5-qtwebsockets for openSUSE:Factory checked in at 2015-03-01 15:27:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebsockets (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtwebsockets" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebsockets/libqt5-qtwebsockets.changes 2014-12-21 11:56:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new/libqt5-qtwebsockets.changes 2015-03-01 15:27:21.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Feb 24 16:10:35 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.4.1 + * For more details please see: + http://blog.qt.io/blog/2015/02/24/qt-5-4-1-released/ +- Split the imports into separate package +- Add minimal requires on libQtQuick5 and libQt5Network5 + +------------------------------------------------------------------- Old: ---- qtwebsockets-opensource-src-5.4.0.tar.xz New: ---- qtwebsockets-opensource-src-5.4.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebsockets.spec ++++++ --- /var/tmp/diff_new_pack.GGYwbR/_old 2015-03-01 15:27:22.000000000 +0100 +++ /var/tmp/diff_new_pack.GGYwbR/_new 2015-03-01 15:27:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtwebsockets # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,15 +21,15 @@ %define libname libQt5WebSockets5 Name: libqt5-qtwebsockets -Version: 5.4.0 +Version: 5.4.1 Release: 0 Summary: Qt 5 WebSockets Library License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: Development/Libraries/X11 Url: http://qt.digia.com %define base_name libqt5 -%define real_version 5.4.0 -%define so_version 5.4.0 +%define real_version 5.4.1 +%define so_version 5.4.1 %define tar_version qtwebsockets-opensource-src-%{real_version} Source: %{tar_version}.tar.xz Source1: baselibs.conf @@ -59,6 +59,7 @@ %package -n %libname Summary: Qt 5 WebSockets Library Group: Development/Libraries/X11 +%requires_ge libQt5Network5 %description -n %libname Qt is a set of libraries for developing applications. @@ -66,6 +67,20 @@ This package contains base tools, like string, xml, and network handling. +%package -n %libname-imports +Summary: Qt 5 WebSockets Library - QML imports +Group: Development/Libraries/X11 +Supplements: packageand(%libname:libQtQuick5) +# imports splited with 5.4.1 +Conflicts: %libname < 5.4.1 +%requires_ge libQtQuick5 + +%description -n %libname-imports +Qt is a set of libraries for developing applications. + +This package contains base tools, like string, xml, and network +handling. + %package devel Summary: Qt Development Kit Group: Development/Libraries/X11 @@ -116,6 +131,10 @@ %defattr(-,root,root,755) %doc LICENSE %{_libqt5_libdir}/libQt5WebSockets.so.* + +%files -n %libname-imports +%defattr(-,root,root,755) +%doc LICENSE %{_libqt5_archdatadir}/qml/Qt/WebSockets/ %files private-headers-devel ++++++ qtwebsockets-opensource-src-5.4.0.tar.xz -> qtwebsockets-opensource-src-5.4.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/.qmake.conf new/qtwebsockets-opensource-src-5.4.1/.qmake.conf --- old/qtwebsockets-opensource-src-5.4.0/.qmake.conf 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/.qmake.conf 2015-02-17 05:57:30.000000000 +0100 @@ -3,4 +3,4 @@ CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.4.0 +MODULE_VERSION = 5.4.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/.tag new/qtwebsockets-opensource-src-5.4.1/.tag --- old/qtwebsockets-opensource-src-5.4.0/.tag 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/.tag 2015-02-17 05:57:31.000000000 +0100 @@ -1 +1 @@ -d1c9ede19976767393fe5db2f396c0c18d6fbced +5f8093e6f985a7a887ffaa1e2fecd7314b5444c6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qdefaultmaskgenerator_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.0/QtWebSockets/private/qdefaultmaskgenerator_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qdefaultmaskgenerator_p.h 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.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-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qsslserver_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.0/QtWebSockets/private/qsslserver_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qsslserver_p.h 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.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-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocket_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocket_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocket_p.h 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.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-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.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-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocketdataprocessor_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocketdataprocessor_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocketdataprocessor_p.h 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.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-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocketframe_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocketframe_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocketframe_p.h 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.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-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsockethandshakerequest_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsockethandshakerequest_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsockethandshakerequest_p.h 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.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-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.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-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocketprotocol_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocketprotocol_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocketprotocol_p.h 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.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-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocketserver_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocketserver_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.0/QtWebSockets/private/qwebsocketserver_p.h 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.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-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qdefaultmaskgenerator_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qdefaultmaskgenerator_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qdefaultmaskgenerator_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qdefaultmaskgenerator_p.h 2015-02-17 05:57:31.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qdefaultmaskgenerator_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qsslserver_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qsslserver_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qsslserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qsslserver_p.h 2015-02-17 05:57:31.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qsslserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocket_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocket_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocket_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocket_p.h 2015-02-17 05:57:31.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocket_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 2015-02-17 05:57:31.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocketcorsauthenticator_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketdataprocessor_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketdataprocessor_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketdataprocessor_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketdataprocessor_p.h 2015-02-17 05:57:31.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocketdataprocessor_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketframe_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketframe_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketframe_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketframe_p.h 2015-02-17 05:57:31.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocketframe_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsockethandshakerequest_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsockethandshakerequest_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsockethandshakerequest_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsockethandshakerequest_p.h 2015-02-17 05:57:31.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsockethandshakerequest_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h 2015-02-17 05:57:31.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsockethandshakeresponse_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketprotocol_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketprotocol_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketprotocol_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketprotocol_p.h 2015-02-17 05:57:31.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocketprotocol_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketserver_p.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketserver_p.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/5.4.1/QtWebSockets/private/qwebsocketserver_p.h 2015-02-17 05:57:31.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocketserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/qtwebsocketsversion.h new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/qtwebsocketsversion.h --- old/qtwebsockets-opensource-src-5.4.0/include/QtWebSockets/qtwebsocketsversion.h 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/include/QtWebSockets/qtwebsocketsversion.h 2015-02-17 05:57:31.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTWEBSOCKETS_VERSION_H #define QT_QTWEBSOCKETS_VERSION_H -#define QTWEBSOCKETS_VERSION_STR "5.4.0" +#define QTWEBSOCKETS_VERSION_STR "5.4.1" -#define QTWEBSOCKETS_VERSION 0x050400 +#define QTWEBSOCKETS_VERSION 0x050401 #endif // QT_QTWEBSOCKETS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/src/imports/qmlwebsockets/qmlwebsockets.pro new/qtwebsockets-opensource-src-5.4.1/src/imports/qmlwebsockets/qmlwebsockets.pro --- old/qtwebsockets-opensource-src-5.4.0/src/imports/qmlwebsockets/qmlwebsockets.pro 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/src/imports/qmlwebsockets/qmlwebsockets.pro 2015-02-17 05:57:31.000000000 +0100 @@ -14,4 +14,6 @@ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 +IMPORT_VERSION = 1.0 + load(qml_plugin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/src/websockets/qwebsocket_p.cpp new/qtwebsockets-opensource-src-5.4.1/src/websockets/qwebsocket_p.cpp --- old/qtwebsockets-opensource-src-5.4.0/src/websockets/qwebsocket_p.cpp 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/src/websockets/qwebsocket_p.cpp 2015-02-17 05:57:31.000000000 +0100 @@ -300,6 +300,8 @@ return; if (!m_isClosingHandshakeSent) { Q_Q(QWebSocket); + m_closeCode = closeCode; + m_closeReason = reason; const quint16 code = qToBigEndian<quint16>(closeCode); QByteArray payload; payload.append(static_cast<const char *>(static_cast<const void *>(&code)), 2); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/src/websockets/qwebsocketserver.cpp new/qtwebsockets-opensource-src-5.4.1/src/websockets/qwebsocketserver.cpp --- old/qtwebsockets-opensource-src-5.4.0/src/websockets/qwebsocketserver.cpp 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/src/websockets/qwebsocketserver.cpp 2015-02-17 05:57:31.000000000 +0100 @@ -247,6 +247,8 @@ */ QWebSocketServer::~QWebSocketServer() { + Q_D(QWebSocketServer); + d->close(true); } /*! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/src/websockets/qwebsocketserver_p.cpp new/qtwebsockets-opensource-src-5.4.1/src/websockets/qwebsocketserver_p.cpp --- old/qtwebsockets-opensource-src-5.4.0/src/websockets/qwebsocketserver_p.cpp 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/src/websockets/qwebsocketserver_p.cpp 2015-02-17 05:57:31.000000000 +0100 @@ -74,7 +74,7 @@ void QWebSocketServerPrivate::init() { if (m_secureMode == NonSecureMode) { - m_pTcpServer = new QTcpServer(); + m_pTcpServer = new QTcpServer(q_ptr); if (Q_LIKELY(m_pTcpServer)) QObjectPrivate::connect(m_pTcpServer, &QTcpServer::newConnection, this, &QWebSocketServerPrivate::onNewConnection); @@ -82,7 +82,7 @@ qFatal("Could not allocate memory for tcp server."); } else { #ifndef QT_NO_SSL - QSslServer *pSslServer = new QSslServer(); + QSslServer *pSslServer = new QSslServer(q_ptr); m_pTcpServer = pSslServer; if (Q_LIKELY(m_pTcpServer)) { QObjectPrivate::connect(pSslServer, &QSslServer::newEncryptedConnection, @@ -105,8 +105,6 @@ */ QWebSocketServerPrivate::~QWebSocketServerPrivate() { - close(true); - m_pTcpServer->deleteLater(); } /*! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.4.0/tests/auto/qwebsocket/tst_qwebsocket.cpp new/qtwebsockets-opensource-src-5.4.1/tests/auto/qwebsocket/tst_qwebsocket.cpp --- old/qtwebsockets-opensource-src-5.4.0/tests/auto/qwebsocket/tst_qwebsocket.cpp 2014-12-05 17:25:16.000000000 +0100 +++ new/qtwebsockets-opensource-src-5.4.1/tests/auto/qwebsocket/tst_qwebsocket.cpp 2015-02-17 05:57:31.000000000 +0100 @@ -471,6 +471,11 @@ isLastFrame = arguments.at(1).toBool(); QCOMPARE(frameReceived, QStringLiteral("Hello world!")); QVERIFY(isLastFrame); + + QString reason = QStringLiteral("going away"); + socket.close(QWebSocketProtocol::CloseCodeGoingAway, reason); + QCOMPARE(socket.closeCode(), QWebSocketProtocol::CloseCodeGoingAway); + QCOMPARE(socket.closeReason(), reason); #endif } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org