Hello community,
here is the log from the commit of package libqt5-qtwebsockets for
openSUSE:Factory checked in at 2014-09-08 21:28:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-06-30 21:50:27.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new/libqt5-qtwebsockets.changes
2014-09-08 21:28:54.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Sep 4 20:37:34 UTC 2014 - [email protected]
+
+- Update to 5.3.2~git20140904 (rca03374):
+ * Tip of the bugfix 5.3.2 branch:
+ * Use 0 instead of Q_NULLPTR in public headers.
+ * Fix a typo in proxy handling.
+ * Bump version
+
+-------------------------------------------------------------------
Old:
----
qtwebsockets-opensource-src-5.3.1.tar.xz
New:
----
qtwebsockets-opensource-src-5.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebsockets.spec ++++++
--- /var/tmp/diff_new_pack.fWgGPV/_old 2014-09-08 21:28:55.000000000 +0200
+++ /var/tmp/diff_new_pack.fWgGPV/_new 2014-09-08 21:28:55.000000000 +0200
@@ -16,25 +16,21 @@
#
-%define qt5_snapshot 0
+%define qt5_snapshot 1
%define libname libQt5WebSockets5
Name: libqt5-qtwebsockets
-Version: 5.3.1
+Version: 5.3.2~git20140904
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.3.1
-%define so_version 5.3.1
-%if %qt5_snapshot
-%define tar_version qtwebsockets-%{real_version}
-%else
+%define real_version 5.3.2
+%define so_version 5.3.2
%define tar_version qtwebsockets-opensource-src-%{real_version}
-%endif
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
BuildRequires: libQt5Core-private-headers-devel >= %{version}
@@ -58,11 +54,7 @@
handling.
%prep
-%if %qt5_snapshot
-%setup -q -n qtwebsockets-%{real_version}
-%else
%setup -q -n qtwebsockets-opensource-src-%{real_version}
-%endif
%package -n %libname
Summary: Qt 5 WebSockets Library
++++++ qtwebsockets-opensource-src-5.3.1.tar.xz ->
qtwebsockets-opensource-src-5.3.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.1/.qmake.conf
new/qtwebsockets-opensource-src-5.3.2/.qmake.conf
--- old/qtwebsockets-opensource-src-5.3.1/.qmake.conf 2014-06-19
12:08:33.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.2/.qmake.conf 2014-07-11
14:36:23.000000000 +0200
@@ -3,4 +3,4 @@
CONFIG += qt_example_installs
CONFIG += warning_clean
-MODULE_VERSION = 5.3.1
+MODULE_VERSION = 5.3.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.1/.tag
new/qtwebsockets-opensource-src-5.3.2/.tag
--- old/qtwebsockets-opensource-src-5.3.1/.tag 2014-06-19 12:08:33.000000000
+0200
+++ new/qtwebsockets-opensource-src-5.3.2/.tag 2014-07-11 14:36:23.000000000
+0200
@@ -1 +1 @@
-eb16b1970293dfeb5918751afbdf1fb7f62028e1
+ca03374390c4d5f4e8f2156f3b2038f984ed39d4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qdefaultmaskgenerator_p.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/QtWebSockets/private/qdefaultmaskgenerator_p.h
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qdefaultmaskgenerator_p.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/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.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qsslserver_p.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/QtWebSockets/private/qsslserver_p.h
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qsslserver_p.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/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.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocket_p.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocket_p.h
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocket_p.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/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.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/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.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketdataprocessor_p.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketdataprocessor_p.h
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketdataprocessor_p.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/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.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketframe_p.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketframe_p.h
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketframe_p.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/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.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsockethandshakerequest_p.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsockethandshakerequest_p.h
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsockethandshakerequest_p.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/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.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/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.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketprotocol_p.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketprotocol_p.h
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketprotocol_p.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/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.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketserver_p.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketserver_p.h
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketserver_p.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/5.3.1/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.3.1/include/QtWebSockets/QMaskGenerator
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/QMaskGenerator
--- old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/QMaskGenerator
2014-06-19 12:08:33.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.2/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-opensource-src-5.3.1/include/QtWebSockets/QWebSocket
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/QWebSocket
--- old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/QWebSocket
2014-06-19 12:08:33.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.2/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-opensource-src-5.3.1/include/QtWebSockets/QWebSocketCorsAuthenticator
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/QWebSocketCorsAuthenticator
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/QWebSocketCorsAuthenticator
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/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-opensource-src-5.3.1/include/QtWebSockets/QWebSocketServer
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/QWebSocketServer
--- old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/QWebSocketServer
2014-06-19 12:08:33.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.2/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-opensource-src-5.3.1/include/QtWebSockets/QtWebSockets
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/QtWebSockets
--- old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/QtWebSockets
2014-06-19 12:08:33.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/QtWebSockets
1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +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 "qwebsocketprotocol.h"
-#include "qwebsocketserver.h"
-#include "qtwebsocketsversion.h"
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/QtWebSocketsVersion
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/QtWebSocketsVersion
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/QtWebSocketsVersion
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/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-opensource-src-5.3.1/include/QtWebSockets/headers.pri
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/headers.pri
--- old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/headers.pri
2014-06-19 12:08:33.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/headers.pri
1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-SYNCQT.HEADER_FILES = qmaskgenerator.h qwebsocket.h
qwebsocketcorsauthenticator.h qwebsocketprotocol.h qwebsockets_global.h
qwebsocketserver.h ../../include/QtWebSockets/qtwebsocketsversion.h
../../include/QtWebSockets/QtWebSockets
-SYNCQT.HEADER_CLASSES = ../../include/QtWebSockets/QMaskGenerator
../../include/QtWebSockets/QWebSocket
../../include/QtWebSockets/QWebSocketCorsAuthenticator
../../include/QtWebSockets/QWebSocketServer
../../include/QtWebSockets/QtWebSocketsVersion
-SYNCQT.PRIVATE_HEADER_FILES = qdefaultmaskgenerator_p.h qsslserver_p.h
qwebsocket_p.h qwebsocketcorsauthenticator_p.h qwebsocketdataprocessor_p.h
qwebsocketframe_p.h qwebsockethandshakerequest_p.h
qwebsockethandshakeresponse_p.h qwebsocketprotocol_p.h qwebsocketserver_p.h
-SYNCQT.QPA_HEADER_FILES =
-SYNCQT.INJECTIONS =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/qmaskgenerator.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/qmaskgenerator.h
--- old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/qmaskgenerator.h
2014-06-19 12:08:33.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.2/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-opensource-src-5.3.1/include/QtWebSockets/qtwebsocketsversion.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/qtwebsocketsversion.h
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/qtwebsocketsversion.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/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 "5.3.1"
-
-#define QTWEBSOCKETS_VERSION 0x050301
-
-#endif // QT_QTWEBSOCKETS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/qwebsocket.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/qwebsocket.h
--- old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/qwebsocket.h
2014-06-19 12:08:33.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.2/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-opensource-src-5.3.1/include/QtWebSockets/qwebsocketcorsauthenticator.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/qwebsocketcorsauthenticator.h
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/qwebsocketcorsauthenticator.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/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-opensource-src-5.3.1/include/QtWebSockets/qwebsocketprotocol.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/qwebsocketprotocol.h
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/qwebsocketprotocol.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/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-opensource-src-5.3.1/include/QtWebSockets/qwebsockets_global.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/qwebsockets_global.h
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/qwebsockets_global.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/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-opensource-src-5.3.1/include/QtWebSockets/qwebsocketserver.h
new/qtwebsockets-opensource-src-5.3.2/include/QtWebSockets/qwebsocketserver.h
---
old/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/qwebsocketserver.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/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-opensource-src-5.3.1/src/imports/qmlwebsockets/qqmlwebsocket.h
new/qtwebsockets-opensource-src-5.3.2/src/imports/qmlwebsockets/qqmlwebsocket.h
---
old/qtwebsockets-opensource-src-5.3.1/src/imports/qmlwebsockets/qqmlwebsocket.h
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/src/imports/qmlwebsockets/qqmlwebsocket.h
2014-07-11 14:36:23.000000000 +0200
@@ -63,7 +63,7 @@
Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged)
public:
- explicit QQmlWebSocket(QObject *parent = Q_NULLPTR);
+ explicit QQmlWebSocket(QObject *parent = 0);
virtual ~QQmlWebSocket();
enum Status
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.3.1/src/websockets/qmaskgenerator.h
new/qtwebsockets-opensource-src-5.3.2/src/websockets/qmaskgenerator.h
--- old/qtwebsockets-opensource-src-5.3.1/src/websockets/qmaskgenerator.h
2014-06-19 12:08:33.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.2/src/websockets/qmaskgenerator.h
2014-07-11 14:36:23.000000000 +0200
@@ -52,7 +52,7 @@
Q_DISABLE_COPY(QMaskGenerator)
public:
- explicit QMaskGenerator(QObject *parent = Q_NULLPTR);
+ explicit QMaskGenerator(QObject *parent = 0);
virtual ~QMaskGenerator();
virtual bool seed() = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.3.1/src/websockets/qwebsocket.h
new/qtwebsockets-opensource-src-5.3.2/src/websockets/qwebsocket.h
--- old/qtwebsockets-opensource-src-5.3.1/src/websockets/qwebsocket.h
2014-06-19 12:08:33.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.2/src/websockets/qwebsocket.h
2014-07-11 14:36:23.000000000 +0200
@@ -69,7 +69,7 @@
public:
explicit QWebSocket(const QString &origin = QString(),
QWebSocketProtocol::Version version =
QWebSocketProtocol::VersionLatest,
- QObject *parent = Q_NULLPTR);
+ QObject *parent = 0);
virtual ~QWebSocket();
void abort();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.3.1/src/websockets/qwebsocket_p.cpp
new/qtwebsockets-opensource-src-5.3.2/src/websockets/qwebsocket_p.cpp
--- old/qtwebsockets-opensource-src-5.3.1/src/websockets/qwebsocket_p.cpp
2014-06-19 12:08:33.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.2/src/websockets/qwebsocket_p.cpp
2014-07-11 14:36:23.000000000 +0200
@@ -1227,7 +1227,7 @@
*/
void QWebSocketPrivate::setProxy(const QNetworkProxy &networkProxy)
{
- if (networkProxy != networkProxy)
+ if (m_configuration.m_proxy != networkProxy)
m_configuration.m_proxy = networkProxy;
}
#endif //QT_NO_NETWORKPROXY
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.3.1/src/websockets/qwebsocketserver.h
new/qtwebsockets-opensource-src-5.3.2/src/websockets/qwebsocketserver.h
--- old/qtwebsockets-opensource-src-5.3.1/src/websockets/qwebsocketserver.h
2014-06-19 12:08:33.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.2/src/websockets/qwebsocketserver.h
2014-07-11 14:36:23.000000000 +0200
@@ -77,7 +77,7 @@
};
explicit QWebSocketServer(const QString &serverName, SslMode secureMode,
- QObject *parent = Q_NULLPTR);
+ QObject *parent = 0);
virtual ~QWebSocketServer();
bool listen(const QHostAddress &address = QHostAddress::Any, quint16 port
= 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.3.1/tests/auto/qwebsocket/tst_qwebsocket.cpp
new/qtwebsockets-opensource-src-5.3.2/tests/auto/qwebsocket/tst_qwebsocket.cpp
---
old/qtwebsockets-opensource-src-5.3.1/tests/auto/qwebsocket/tst_qwebsocket.cpp
2014-06-19 12:08:33.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.3.2/tests/auto/qwebsocket/tst_qwebsocket.cpp
2014-07-11 14:36:23.000000000 +0200
@@ -147,6 +147,7 @@
void tst_sendTextMessage();
void tst_sendBinaryMessage();
void tst_errorString();
+ void tst_setProxy();
};
tst_QWebSocket::tst_QWebSocket()
@@ -575,6 +576,23 @@
QCOMPARE(socket.errorString(), QStringLiteral("Host not found"));
}
+void tst_QWebSocket::tst_setProxy()
+{
+ // check if property assignment works as expected.
+ QWebSocket socket;
+ QCOMPARE(socket.proxy(), QNetworkProxy(QNetworkProxy::DefaultProxy));
+
+ QNetworkProxy proxy;
+ proxy.setPort(123);
+ socket.setProxy(proxy);
+ QCOMPARE(socket.proxy(), proxy);
+
+ proxy.setPort(321);
+ QCOMPARE(socket.proxy().port(), quint16(123));
+ socket.setProxy(proxy);
+ QCOMPARE(socket.proxy(), proxy);
+}
+
QTEST_MAIN(tst_QWebSocket)
#include "tst_qwebsocket.moc"
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
