openSUSE Commits
Threads by month
- ----- 2024 -----
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
September 2014
- 1 participants
- 1675 discussions
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 - hrvoje.senjan(a)gmail.com
+
+- 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: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qttools for openSUSE:Factory checked in at 2014-09-08 21:28:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qttools (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qttools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qttools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qttools/libqt5-qttools.changes 2014-06-30 21:50:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qttools.new/libqt5-qttools.changes 2014-09-08 21:28:53.000000000 +0200
@@ -1,0 +2,20 @@
+Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2~git20140904 (rd8bc98b):
+ * Tip of the bugfix 5.3.2 branch:
+ * Update copyright year in About dialogs
+ * fix gaelic plural rules
+ * Add bearer plugin deployment
+ * qtpaths: add missing GenericConfigLocation,
+ exists since Qt 5.2.0
+ * Ignore local and non-filesystem qml imports.
+ * Bump version
+
+-------------------------------------------------------------------
+Mon Sep 1 21:39:42 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Drop icons from sources, and install them directly from tarball
+- Add QDBusViewer desktop file
+- Add trailing ';' to desktop files
+
+-------------------------------------------------------------------
Old:
----
assistant5.png
designer5.png
linguist5.png
qttools-opensource-src-5.3.1.tar.xz
New:
----
qdbusviewer5.desktop
qttools-opensource-src-5.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qttools.spec ++++++
--- /var/tmp/diff_new_pack.o9IEmz/_old 2014-09-08 21:28:54.000000000 +0200
+++ /var/tmp/diff_new_pack.o9IEmz/_new 2014-09-08 21:28:54.000000000 +0200
@@ -16,31 +16,25 @@
#
-%define qt5_snapshot 0
+%define qt5_snapshot 1
Name: libqt5-qttools
-Version: 5.3.1
+Version: 5.3.2~git20140904
Release: 0
Summary: Qt 5 QtTools Module
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 qttools-%{real_version}
-%else
+%define real_version 5.3.2
+%define so_version 5.3.2
%define tar_version qttools-opensource-src-%{real_version}
-%endif
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
Source11: designer5.desktop
Source12: linguist5.desktop
Source13: assistant5.desktop
-Source14: assistant5.png
-Source15: designer5.png
-Source16: linguist5.png
+Source14: qdbusviewer5.desktop
BuildRequires: fdupes
BuildRequires: libQt5WebKitWidgets-devel >= %{version}
BuildRequires: libqt5-qtbase-devel >= %{version}
@@ -63,11 +57,7 @@
This package contains base tools, like string, xml, and network handling.
%prep
-%if %qt5_snapshot
-%setup -q -n qttools-%{real_version}
-%else
%setup -q -n qttools-opensource-src-%{real_version}
-%endif
%package devel
Summary: Qt Development Kit
@@ -202,16 +192,18 @@
done
popd
-#
-# install menu entries
-#
-
-##%suse_update_desktop_file -i designer5 Qt Development GUIDesigner
-##%suse_update_desktop_file -i linguist5 Qt Development Translation
-##%suse_update_desktop_file -i assistant5 Qt Development Documentation
-
-##mkdir -p %{buildroot}%{_datadir}/doc/packages/libqt5
-##cp -a src/assistant/assistant/assistant.qch %{buildroot}%{_datadir}/doc/packages/libqt5/
+install -D -m644 %{SOURCE11} %{buildroot}%{_datadir}/applications/designer5.desktop
+install -D -m644 %{SOURCE12} %{buildroot}%{_datadir}/applications/linguist5.desktop
+install -D -m644 %{SOURCE13} %{buildroot}%{_datadir}/applications/assistant5.desktop
+install -D -m644 %{SOURCE14} %{buildroot}%{_datadir}/applications/qdbusviewer5.desktop
+
+install -D -m644 src/assistant/assistant/images/assistant.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/assistant5.png
+install -D -m644 src/assistant/assistant/images/assistant-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/assistant5.png
+install -D -m644 src/linguist/linguist/images/icons/linguist-32-32.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/linguist5.png
+install -D -m644 src/linguist/linguist/images/icons/linguist-128-32.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/linguist5.png
+install -D -m644 src/designer/src/designer/images/designer.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/designer5.png
+install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/qdbusviewer5.png
+install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qdbusviewer5.png
%files
%defattr(-,root,root,755)
@@ -238,8 +230,12 @@
%{_libqt5_bindir}/qtpaths*
%{_datadir}/applications/assistant5.desktop
%{_datadir}/applications/designer5.desktop
-%{_datadir}/pixmaps/assistant5.png
-%{_datadir}/pixmaps/designer5.png
+%{_datadir}/applications/qdbusviewer5.desktop
+%dir %{_datadir}/icons/hicolor/*
+%dir %{_datadir}/icons/hicolor/*/apps
+%{_datadir}/icons/hicolor/*/apps/assistant5.png
+%{_datadir}/icons/hicolor/*/apps/designer5.png
+%{_datadir}/icons/hicolor/*/apps/qdbusviewer5.png
%{_libqt5_libdir}/qt5/plugins/designer
%files -n libqt5-linguist
@@ -254,7 +250,9 @@
%{_libqt5_bindir}/lrelease*
%{_libqt5_bindir}/lupdate*
%{_datadir}/applications/linguist5.desktop
-%{_datadir}/pixmaps/linguist5.png
+%dir %{_datadir}/icons/hicolor/*
+%dir %{_datadir}/icons/hicolor/*/apps
+%{_datadir}/icons/hicolor/*/apps/linguist5.png
%files -n libQt5CLucene5
%defattr(-,root,root,755)
++++++ assistant5.desktop ++++++
--- /var/tmp/diff_new_pack.o9IEmz/_old 2014-09-08 21:28:54.000000000 +0200
+++ /var/tmp/diff_new_pack.o9IEmz/_new 2014-09-08 21:28:54.000000000 +0200
@@ -1,5 +1,5 @@
[Desktop Entry]
-Categories=Qt;Development;Documentation
+Categories=Qt;Development;Documentation;
Encoding=UTF-8
Exec=/usr/bin/assistant-qt5
Name=Qt 5 Assistant
++++++ designer5.desktop ++++++
--- /var/tmp/diff_new_pack.o9IEmz/_old 2014-09-08 21:28:54.000000000 +0200
+++ /var/tmp/diff_new_pack.o9IEmz/_new 2014-09-08 21:28:54.000000000 +0200
@@ -1,5 +1,5 @@
[Desktop Entry]
-Categories=Qt;Development;GUIDesigner
+Categories=Qt;Development;GUIDesigner;
Encoding=UTF-8
Exec=/usr/bin/designer-qt5
Name=Qt 5 Designer
++++++ linguist5.desktop ++++++
--- /var/tmp/diff_new_pack.o9IEmz/_old 2014-09-08 21:28:54.000000000 +0200
+++ /var/tmp/diff_new_pack.o9IEmz/_new 2014-09-08 21:28:54.000000000 +0200
@@ -1,5 +1,5 @@
[Desktop Entry]
-Categories=Qt;Development;Translation
+Categories=Qt;Development;Translation;
Encoding=UTF-8
Exec=/usr/bin/linguist-qt5
Name=Qt 5 Linguist
++++++ qdbusviewer5.desktop ++++++
[Desktop Entry]
Categories=Qt;Development;Debugger;
Encoding=UTF-8
Exec=/usr/bin/qdbusviewer-qt5
Name=Qt 5 D-Bus Viewer
GenericName=D-Bus Debugger
Comment=Introspect D-Bus objects and messages
X-KDE-StartupNotify=true
Terminal=false
Type=Application
Icon=qdbusviewer5
++++++ qttools-opensource-src-5.3.1.tar.xz -> qttools-opensource-src-5.3.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qttools/qttools-opensource-src-5.3.1.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qttools.new/qttools-opensource-src-5.3.2.tar.xz differ: char 17, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qtsvg for openSUSE:Factory checked in at 2014-09-08 21:28:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtsvg (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtsvg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtsvg"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtsvg/libqt5-qtsvg.changes 2014-06-30 21:50:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtsvg.new/libqt5-qtsvg.changes 2014-09-08 21:28:51.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2~git20140904 (rd8bc98b):
+ * Tip of the bugfix 5.3.2 branch:
+ * Bump version
+
+-------------------------------------------------------------------
Old:
----
qtsvg-opensource-src-5.3.1.tar.xz
New:
----
qtsvg-opensource-src-5.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtsvg.spec ++++++
--- /var/tmp/diff_new_pack.WlqrFI/_old 2014-09-08 21:28:52.000000000 +0200
+++ /var/tmp/diff_new_pack.WlqrFI/_new 2014-09-08 21:28:52.000000000 +0200
@@ -16,25 +16,21 @@
#
-%define qt5_snapshot 0
+%define qt5_snapshot 1
%define libname libQt5Svg5
Name: libqt5-qtsvg
-Version: 5.3.1
+Version: 5.3.2~git20140904
Release: 0
Summary: Qt 5 SVG 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 qtsvg-%{real_version}
-%else
+%define real_version 5.3.2
+%define so_version 5.3.2
%define tar_version qtsvg-opensource-src-%{real_version}
-%endif
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
BuildRequires: libQt5Core-private-headers-devel >= %{version}
@@ -56,11 +52,7 @@
handling.
%prep
-%if %qt5_snapshot
-%setup -q -n qtsvg-%{real_version}
-%else
%setup -q -n qtsvg-opensource-src-%{real_version}
-%endif
%package -n %libname
Summary: Qt 5 SVG Library
++++++ qtsvg-opensource-src-5.3.1.tar.xz -> qtsvg-opensource-src-5.3.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/.qmake.conf new/qtsvg-opensource-src-5.3.2/.qmake.conf
--- old/qtsvg-opensource-src-5.3.1/.qmake.conf 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/.qmake.conf 2014-06-18 00:36:45.000000000 +0200
@@ -2,4 +2,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/qtsvg-opensource-src-5.3.1/.tag new/qtsvg-opensource-src-5.3.2/.tag
--- old/qtsvg-opensource-src-5.3.1/.tag 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/.tag 2014-06-18 00:36:45.000000000 +0200
@@ -1 +1 @@
-35a2f0880831d38c60d2b4820dac808f48f6f3a8
+66444e54dd2aa4554cb0d7ac67601dfc8bf3e272
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgfont_p.h new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvgfont_p.h
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgfont_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvgfont_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgfont_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgfunctions_wince_p.h new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvgfunctions_wince_p.h
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgfunctions_wince_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvgfunctions_wince_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgfunctions_wince_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvggraphics_p.h new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvggraphics_p.h
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvggraphics_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvggraphics_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvggraphics_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvghandler_p.h new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvghandler_p.h
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvghandler_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvghandler_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvghandler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgnode_p.h new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvgnode_p.h
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgnode_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvgnode_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgnode_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgstructure_p.h new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvgstructure_p.h
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgstructure_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvgstructure_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgstructure_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgstyle_p.h new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvgstyle_p.h
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgstyle_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvgstyle_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgstyle_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvgtinydocument_p.h
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgtinydocument_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/5.3.1/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgtinydocument_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/QGraphicsSvgItem new/qtsvg-opensource-src-5.3.2/include/QtSvg/QGraphicsSvgItem
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/QGraphicsSvgItem 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/QGraphicsSvgItem 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qgraphicssvgitem.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/QSvgGenerator new/qtsvg-opensource-src-5.3.2/include/QtSvg/QSvgGenerator
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/QSvgGenerator 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/QSvgGenerator 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsvggenerator.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/QSvgRenderer new/qtsvg-opensource-src-5.3.2/include/QtSvg/QSvgRenderer
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/QSvgRenderer 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/QSvgRenderer 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsvgrenderer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/QSvgWidget new/qtsvg-opensource-src-5.3.2/include/QtSvg/QSvgWidget
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/QSvgWidget 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/QSvgWidget 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsvgwidget.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/QtSvg new/qtsvg-opensource-src-5.3.2/include/QtSvg/QtSvg
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/QtSvg 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/QtSvg 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-#ifndef QT_QTSVG_MODULE_H
-#define QT_QTSVG_MODULE_H
-#include <QtSvg/QtSvgDepends>
-#include "qgraphicssvgitem.h"
-#include "qsvggenerator.h"
-#include "qsvgrenderer.h"
-#include "qsvgwidget.h"
-#include "qtsvgglobal.h"
-#include "qtsvgversion.h"
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/QtSvgVersion new/qtsvg-opensource-src-5.3.2/include/QtSvg/QtSvgVersion
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/QtSvgVersion 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/QtSvgVersion 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qtsvgversion.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/headers.pri new/qtsvg-opensource-src-5.3.2/include/QtSvg/headers.pri
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/headers.pri 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/headers.pri 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-SYNCQT.HEADER_FILES = qgraphicssvgitem.h qsvggenerator.h qsvgrenderer.h qsvgwidget.h qtsvgglobal.h ../../include/QtSvg/qtsvgversion.h ../../include/QtSvg/QtSvg
-SYNCQT.HEADER_CLASSES = ../../include/QtSvg/QGraphicsSvgItem ../../include/QtSvg/QSvgGenerator ../../include/QtSvg/QSvgRenderer ../../include/QtSvg/QSvgWidget ../../include/QtSvg/QtSvgVersion
-SYNCQT.PRIVATE_HEADER_FILES = qsvgfont_p.h qsvgfunctions_wince_p.h qsvggraphics_p.h qsvghandler_p.h qsvgnode_p.h qsvgstructure_p.h qsvgstyle_p.h qsvgtinydocument_p.h
-SYNCQT.QPA_HEADER_FILES =
-SYNCQT.INJECTIONS =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/qgraphicssvgitem.h new/qtsvg-opensource-src-5.3.2/include/QtSvg/qgraphicssvgitem.h
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/qgraphicssvgitem.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/qgraphicssvgitem.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/svg/qgraphicssvgitem.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/qsvggenerator.h new/qtsvg-opensource-src-5.3.2/include/QtSvg/qsvggenerator.h
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/qsvggenerator.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/qsvggenerator.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/svg/qsvggenerator.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/qsvgrenderer.h new/qtsvg-opensource-src-5.3.2/include/QtSvg/qsvgrenderer.h
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/qsvgrenderer.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/qsvgrenderer.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/svg/qsvgrenderer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/qsvgwidget.h new/qtsvg-opensource-src-5.3.2/include/QtSvg/qsvgwidget.h
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/qsvgwidget.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/qsvgwidget.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/svg/qsvgwidget.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/qtsvgglobal.h new/qtsvg-opensource-src-5.3.2/include/QtSvg/qtsvgglobal.h
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/qtsvgglobal.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/qtsvgglobal.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/svg/qtsvgglobal.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.1/include/QtSvg/qtsvgversion.h new/qtsvg-opensource-src-5.3.2/include/QtSvg/qtsvgversion.h
--- old/qtsvg-opensource-src-5.3.1/include/QtSvg/qtsvgversion.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.2/include/QtSvg/qtsvgversion.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-/* This file was generated by syncqt. */
-#ifndef QT_QTSVG_VERSION_H
-#define QT_QTSVG_VERSION_H
-
-#define QTSVG_VERSION_STR "5.3.1"
-
-#define QTSVG_VERSION 0x050301
-
-#endif // QT_QTSVG_VERSION_H
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qtserialport for openSUSE:Factory checked in at 2014-09-08 21:28:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtserialport (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtserialport.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtserialport"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtserialport/libqt5-qtserialport.changes 2014-06-30 21:50:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtserialport.new/libqt5-qtserialport.changes 2014-09-08 21:28:50.000000000 +0200
@@ -1,0 +2,34 @@
+Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2~git20140904 (rd8bc98b):
+ * Tip of the bugfix 5.3.2 branch
+ * Fix a race condition at writing on Windows
+ * Add missing private headers warnings
+ * Fix handling of writing at using of waitForReadyRead()
+ * Fix compilation of apps with
+ QT_DISABLE_DEPRECATED_BEFORE=0x050300
+ * Move the synchronous loopback test from benchmarks
+ to auto tests
+ * Make the QSerialPort::flush() non-blocking
+ * Pass a length of string to QString::fromWCharArray
+ * Fix leak of a descriptor after unsuccessful opening
+ * Fix events handling in waitForBytesWritten()
+ method on Windows
+ * Add the synchronous loopback data verification test
+ * Doc: Edited example documentation.
+ * Return from the loop if a port name is found
+ * Wrap of getting the port properties on Windows
+ * Do not continue waitForReadyRead() if an error occurred
+ * Refactor of the QSerialPortInfo for OS X
+ * Make independent implementation of QSerialPortInfo
+ for OS X
+ * Improve error handling for the waitForXX()
+ methods on Windows
+ * Unify handling of errors of the overlapped I/O result
+ * Abort waitForReadyRead() when there is an error
+ * Improve the serial number handling on Windows
+ * Improve the ResourceError handling on Windows
+ * Improve the I/O completion errors handling on Windows
+ * Bump version
+
+-------------------------------------------------------------------
Old:
----
qtserialport-opensource-src-5.3.1.tar.xz
New:
----
qtserialport-opensource-src-5.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtserialport.spec ++++++
--- /var/tmp/diff_new_pack.ZXdL4x/_old 2014-09-08 21:28:51.000000000 +0200
+++ /var/tmp/diff_new_pack.ZXdL4x/_new 2014-09-08 21:28:51.000000000 +0200
@@ -16,25 +16,21 @@
#
-%define qt5_snapshot 0
+%define qt5_snapshot 1
%define libname libQt5SerialPort5
Name: libqt5-qtserialport
-Version: 5.3.1
+Version: 5.3.2~git20140904
Release: 0
Summary: Qt 5 Serial Port Addon
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 qtserialport-%{real_version}
-%else
+%define real_version 5.3.2
+%define so_version 5.3.2
%define tar_version qtserialport-opensource-src-%{real_version}
-%endif
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
BuildRequires: fdupes
@@ -55,11 +51,7 @@
handling.
%prep
-%if %qt5_snapshot
-%setup -q -n qtserialport-%{real_version}
-%else
%setup -q -n qtserialport-opensource-src-%{real_version}
-%endif
%package -n %libname
Summary: Qt 5 Serial Port Addon
++++++ qtserialport-opensource-src-5.3.1.tar.xz -> qtserialport-opensource-src-5.3.2.tar.xz ++++++
++++ 2528 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qtsensors for openSUSE:Factory checked in at 2014-09-08 21:28:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtsensors (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtsensors.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtsensors"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtsensors/libqt5-qtsensors.changes 2014-06-30 21:50:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtsensors.new/libqt5-qtsensors.changes 2014-09-08 21:28:48.000000000 +0200
@@ -1,0 +2,14 @@
+Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2~git20140904 (rf33363d):
+ * Tip of the bugfix 5.3.2 branch:
+ * Add missing private headers warning
+ * Do not warn when failing to load static plugins
+ as sensor plugins
+ * Do not warn if no config file is found.
+ * Add missing word to QCompass documentation.
+ * Restore setting of sensors interface.
+ * Series of crash fixes from Mer, squashed
+ * [sensorfw] need to run init after sensord has been restarted
+
+-------------------------------------------------------------------
Old:
----
qtsensors-opensource-src-5.3.1.tar.xz
New:
----
qtsensors-opensource-src-5.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtsensors.spec ++++++
--- /var/tmp/diff_new_pack.3gKJmF/_old 2014-09-08 21:28:49.000000000 +0200
+++ /var/tmp/diff_new_pack.3gKJmF/_new 2014-09-08 21:28:49.000000000 +0200
@@ -16,25 +16,21 @@
#
-%define qt5_snapshot 0
+%define qt5_snapshot 1
%define libname libQt5Sensors5
Name: libqt5-qtsensors
-Version: 5.3.1
+Version: 5.3.2~git20140904
Release: 0
Summary: Qt 5 Serial Port Addon
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 qtsensors-%{real_version}
-%else
+%define real_version 5.3.2
+%define so_version 5.3.2
%define tar_version qtsensors-opensource-src-%{real_version}
-%endif
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
BuildRequires: fdupes
@@ -53,11 +49,7 @@
Qt is a set of libraries for developing applications.
%prep
-%if %qt5_snapshot
-%setup -q -n qtsensors-%{real_version}
-%else
%setup -q -n qtsensors-opensource-src-%{real_version}
-%endif
%package -n %libname
Summary: Qt 5 Serial Port Addon
@@ -117,6 +109,8 @@
# kill .la files
rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
+%fdupes -s %{buildroot}%{_libqt5_examplesdir}
+
%files -n %libname
%defattr(-,root,root,755)
%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
++++++ qtsensors-opensource-src-5.3.1.tar.xz -> qtsensors-opensource-src-5.3.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/.qmake.conf new/qtsensors-opensource-src-5.3.2/.qmake.conf
--- old/qtsensors-opensource-src-5.3.1/.qmake.conf 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/.qmake.conf 2014-08-18 09:39:35.000000000 +0200
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.3.1
+MODULE_VERSION = 5.3.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/.tag new/qtsensors-opensource-src-5.3.2/.tag
--- old/qtsensors-opensource-src-5.3.1/.tag 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/.tag 2014-08-18 09:39:35.000000000 +0200
@@ -1 +1 @@
-facae1ad357a80859da51f52f49db8c53d2e89be
+f33363d292484f0fe62b177df0fd8080910d01f9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/dist/changes-5.3.1 new/qtsensors-opensource-src-5.3.2/dist/changes-5.3.1
--- old/qtsensors-opensource-src-5.3.1/dist/changes-5.3.1 1970-01-01 01:00:00.000000000 +0100
+++ new/qtsensors-opensource-src-5.3.2/dist/changes-5.3.1 2014-08-18 09:39:35.000000000 +0200
@@ -0,0 +1,44 @@
+Qt 5.3.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.3.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+ http://qt-project.org/doc/qt-5.3
+
+The Qt version 5.3 series is binary compatible with the 5.2.x series.
+Applications compiled for 5.2 will continue to run with 5.3.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+QtSensors
+---------
+
+ - [QTBUG-38224] Fixed usage of wrong directory separator by some sensor
+ examples.
+
+****************************************************************************
+* Platform Specific Changes *
+****************************************************************************
+
+Android
+-------
+
+ - [QTBUG-39335] Fixed crash when accelerationMode was set to Gravity
+
+Windows
+-------
+
+ - [QTBUG-39698] Fixed crash when trying to access the sensors on a desktop
+ rather than mobile platforms.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/dist/changes-5.3.2 new/qtsensors-opensource-src-5.3.2/dist/changes-5.3.2
--- old/qtsensors-opensource-src-5.3.1/dist/changes-5.3.2 1970-01-01 01:00:00.000000000 +0100
+++ new/qtsensors-opensource-src-5.3.2/dist/changes-5.3.2 2014-08-18 09:39:35.000000000 +0200
@@ -0,0 +1,41 @@
+Qt 5.3.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.3.0 and Qt 5.3.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+ http://qt-project.org/doc/qt-5.3
+
+The Qt version 5.3 series is binary compatible with the 5.2.x series.
+Applications compiled for 5.2 will continue to run with 5.3.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+QtSensors
+---------
+
+ - QCompass documentation improved.
+
+****************************************************************************
+* Platform Specific Changes *
+****************************************************************************
+
+Linux
+-----
+
+ - [sensorfw] Fixed incomplete initialization after restarting sensord.
+ - [sensorfw] Improved debugging and tracing capabilities
+ - [sensorfw] Added more checks to be more tolerant in case of errors or
+ corner cases.
+ - [sensorfw] Minor code cleanups
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qaccelerometer_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qaccelerometer_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qaccelerometer_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qaccelerometer_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qaccelerometer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qaltimeter_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qaltimeter_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qaltimeter_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qaltimeter_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qaltimeter_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qambientlightsensor_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qambientlightsensor_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qambientlightsensor_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qambientlightsensor_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qambientlightsensor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qambienttemperaturesensor_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qambienttemperaturesensor_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qambienttemperaturesensor_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qambienttemperaturesensor_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qambienttemperaturesensor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qcompass_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qcompass_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qcompass_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qcompass_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qcompass_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qgyroscope_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qgyroscope_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qgyroscope_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qgyroscope_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qgyroscope_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qholstersensor_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qholstersensor_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qholstersensor_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qholstersensor_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qholstersensor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qirproximitysensor_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qirproximitysensor_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qirproximitysensor_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qirproximitysensor_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qirproximitysensor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qlightsensor_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qlightsensor_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qlightsensor_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qlightsensor_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qlightsensor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qmagnetometer_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qmagnetometer_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qmagnetometer_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qmagnetometer_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qmagnetometer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qorientationsensor_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qorientationsensor_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qorientationsensor_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qorientationsensor_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qorientationsensor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qpressuresensor_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qpressuresensor_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qpressuresensor_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qpressuresensor_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qpressuresensor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qproximitysensor_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qproximitysensor_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qproximitysensor_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qproximitysensor_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qproximitysensor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qrotationsensor_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qrotationsensor_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qrotationsensor_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qrotationsensor_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qrotationsensor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qsensor_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qsensor_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qsensor_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qsensor_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qsensor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qsensorbackend_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qsensorbackend_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qsensorbackend_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qsensorbackend_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qsensorbackend_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qsensorgesture_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qsensorgesture_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qsensorgesture_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qsensorgesture_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/gestures/qsensorgesture_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qsensorgesturemanagerprivate_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qsensorgesturemanagerprivate_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qsensorgesturemanagerprivate_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qsensorgesturemanagerprivate_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/gestures/qsensorgesturemanagerprivate_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qtapsensor_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qtapsensor_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qtapsensor_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qtapsensor_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qtapsensor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qtiltsensor_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qtiltsensor_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/qtiltsensor_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/qtiltsensor_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/qtiltsensor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/sensorlog_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/sensorlog_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/sensorlog_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/sensorlog_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/sensorlog_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/simulatorgesturescommon_p.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/simulatorgesturescommon_p.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/5.3.1/QtSensors/private/simulatorgesturescommon_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/5.3.1/QtSensors/private/simulatorgesturescommon_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/sensors/gestures/simulatorgesturescommon_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAccelerometer new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAccelerometer
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAccelerometer 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAccelerometer 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qaccelerometer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAccelerometerFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAccelerometerFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAccelerometerFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAccelerometerFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qaccelerometer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAccelerometerReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAccelerometerReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAccelerometerReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAccelerometerReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qaccelerometer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAltimeter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAltimeter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAltimeter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAltimeter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qaltimeter.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAltimeterFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAltimeterFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAltimeterFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAltimeterFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qaltimeter.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAltimeterReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAltimeterReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAltimeterReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAltimeterReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qaltimeter.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAmbientLightFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAmbientLightFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAmbientLightFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAmbientLightFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qambientlightsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAmbientLightReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAmbientLightReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAmbientLightReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAmbientLightReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qambientlightsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAmbientLightSensor new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAmbientLightSensor
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAmbientLightSensor 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAmbientLightSensor 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qambientlightsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAmbientTemperatureFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAmbientTemperatureFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAmbientTemperatureFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAmbientTemperatureFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qambienttemperaturesensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAmbientTemperatureReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAmbientTemperatureReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAmbientTemperatureReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAmbientTemperatureReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qambienttemperaturesensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAmbientTemperatureSensor new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAmbientTemperatureSensor
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QAmbientTemperatureSensor 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QAmbientTemperatureSensor 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qambienttemperaturesensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QCompass new/qtsensors-opensource-src-5.3.2/include/QtSensors/QCompass
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QCompass 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QCompass 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qcompass.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QCompassFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QCompassFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QCompassFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QCompassFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qcompass.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QCompassReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QCompassReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QCompassReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QCompassReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qcompass.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QGyroscope new/qtsensors-opensource-src-5.3.2/include/QtSensors/QGyroscope
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QGyroscope 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QGyroscope 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qgyroscope.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QGyroscopeFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QGyroscopeFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QGyroscopeFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QGyroscopeFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qgyroscope.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QGyroscopeReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QGyroscopeReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QGyroscopeReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QGyroscopeReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qgyroscope.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QHolsterFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QHolsterFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QHolsterFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QHolsterFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qholstersensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QHolsterReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QHolsterReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QHolsterReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QHolsterReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qholstersensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QHolsterSensor new/qtsensors-opensource-src-5.3.2/include/QtSensors/QHolsterSensor
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QHolsterSensor 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QHolsterSensor 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qholstersensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QIRProximityFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QIRProximityFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QIRProximityFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QIRProximityFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qirproximitysensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QIRProximityReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QIRProximityReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QIRProximityReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QIRProximityReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qirproximitysensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QIRProximitySensor new/qtsensors-opensource-src-5.3.2/include/QtSensors/QIRProximitySensor
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QIRProximitySensor 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QIRProximitySensor 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qirproximitysensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QLightFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QLightFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QLightFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QLightFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qlightsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QLightReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QLightReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QLightReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QLightReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qlightsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QLightSensor new/qtsensors-opensource-src-5.3.2/include/QtSensors/QLightSensor
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QLightSensor 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QLightSensor 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qlightsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QMagnetometer new/qtsensors-opensource-src-5.3.2/include/QtSensors/QMagnetometer
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QMagnetometer 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QMagnetometer 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qmagnetometer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QMagnetometerFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QMagnetometerFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QMagnetometerFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QMagnetometerFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qmagnetometer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QMagnetometerReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QMagnetometerReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QMagnetometerReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QMagnetometerReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qmagnetometer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QOrientationFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QOrientationFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QOrientationFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QOrientationFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qorientationsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QOrientationReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QOrientationReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QOrientationReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QOrientationReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qorientationsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QOrientationSensor new/qtsensors-opensource-src-5.3.2/include/QtSensors/QOrientationSensor
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QOrientationSensor 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QOrientationSensor 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qorientationsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QPressureFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QPressureFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QPressureFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QPressureFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qpressuresensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QPressureReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QPressureReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QPressureReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QPressureReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qpressuresensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QPressureSensor new/qtsensors-opensource-src-5.3.2/include/QtSensors/QPressureSensor
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QPressureSensor 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QPressureSensor 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qpressuresensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QProximityFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QProximityFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QProximityFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QProximityFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qproximitysensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QProximityReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QProximityReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QProximityReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QProximityReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qproximitysensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QProximitySensor new/qtsensors-opensource-src-5.3.2/include/QtSensors/QProximitySensor
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QProximitySensor 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QProximitySensor 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qproximitysensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QRotationFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QRotationFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QRotationFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QRotationFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qrotationsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QRotationReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QRotationReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QRotationReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QRotationReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qrotationsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QRotationSensor new/qtsensors-opensource-src-5.3.2/include/QtSensors/QRotationSensor
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QRotationSensor 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QRotationSensor 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qrotationsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensor new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensor
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensor 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensor 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorBackend new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorBackend
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorBackend 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorBackend 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsensorbackend.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorBackendFactory new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorBackendFactory
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorBackendFactory 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorBackendFactory 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsensormanager.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorChangesInterface new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorChangesInterface
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorChangesInterface 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorChangesInterface 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsensorplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorGesture new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorGesture
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorGesture 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorGesture 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsensorgesture.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorGestureManager new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorGestureManager
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorGestureManager 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorGestureManager 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsensorgesturemanager.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorGesturePluginInterface new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorGesturePluginInterface
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorGesturePluginInterface 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorGesturePluginInterface 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsensorgestureplugininterface.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorGestureRecognizer new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorGestureRecognizer
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorGestureRecognizer 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorGestureRecognizer 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsensorgesturerecognizer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorManager new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorManager
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorManager 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorManager 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsensormanager.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorPluginInterface new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorPluginInterface
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorPluginInterface 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorPluginInterface 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsensorplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QSensorReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QSensorReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QTapFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QTapFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QTapFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QTapFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qtapsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QTapReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QTapReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QTapReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QTapReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qtapsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QTapSensor new/qtsensors-opensource-src-5.3.2/include/QtSensors/QTapSensor
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QTapSensor 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QTapSensor 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qtapsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QTiltFilter new/qtsensors-opensource-src-5.3.2/include/QtSensors/QTiltFilter
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QTiltFilter 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QTiltFilter 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qtiltsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QTiltReading new/qtsensors-opensource-src-5.3.2/include/QtSensors/QTiltReading
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QTiltReading 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QTiltReading 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qtiltsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QTiltSensor new/qtsensors-opensource-src-5.3.2/include/QtSensors/QTiltSensor
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QTiltSensor 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QTiltSensor 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qtiltsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QtSensors new/qtsensors-opensource-src-5.3.2/include/QtSensors/QtSensors
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QtSensors 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QtSensors 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-#ifndef QT_QTSENSORS_MODULE_H
-#define QT_QTSENSORS_MODULE_H
-#include <QtSensors/QtSensorsDepends>
-#include "qaccelerometer.h"
-#include "qaltimeter.h"
-#include "qambientlightsensor.h"
-#include "qambienttemperaturesensor.h"
-#include "qcompass.h"
-#include "qgyroscope.h"
-#include "qholstersensor.h"
-#include "qirproximitysensor.h"
-#include "qlightsensor.h"
-#include "qmagnetometer.h"
-#include "qorientationsensor.h"
-#include "qpressuresensor.h"
-#include "qproximitysensor.h"
-#include "qrotationsensor.h"
-#include "qsensor.h"
-#include "qsensorbackend.h"
-#include "qsensormanager.h"
-#include "qsensorplugin.h"
-#include "qsensorsglobal.h"
-#include "qtapsensor.h"
-#include "qtiltsensor.h"
-#include "qsensorgesture.h"
-#include "qsensorgesturemanager.h"
-#include "qsensorgestureplugininterface.h"
-#include "qsensorgesturerecognizer.h"
-#include "qtsensorsversion.h"
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/QtSensorsVersion new/qtsensors-opensource-src-5.3.2/include/QtSensors/QtSensorsVersion
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/QtSensorsVersion 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/QtSensorsVersion 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qtsensorsversion.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/headers.pri new/qtsensors-opensource-src-5.3.2/include/QtSensors/headers.pri
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/headers.pri 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/headers.pri 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-SYNCQT.HEADER_FILES = qaccelerometer.h qaltimeter.h qambientlightsensor.h qambienttemperaturesensor.h qcompass.h qgyroscope.h qholstersensor.h qirproximitysensor.h qlightsensor.h qmagnetometer.h qorientationsensor.h qpressuresensor.h qproximitysensor.h qrotationsensor.h qsensor.h qsensorbackend.h qsensormanager.h qsensorplugin.h qsensorsglobal.h qtapsensor.h qtiltsensor.h gestures/qsensorgesture.h gestures/qsensorgesturemanager.h gestures/qsensorgestureplugininterface.h gestures/qsensorgesturerecognizer.h ../../include/QtSensors/qtsensorsversion.h ../../include/QtSensors/QtSensors
-SYNCQT.HEADER_CLASSES = ../../include/QtSensors/QAccelerometerReading ../../include/QtSensors/QAccelerometerFilter ../../include/QtSensors/QAccelerometer ../../include/QtSensors/QAltimeterReading ../../include/QtSensors/QAltimeterFilter ../../include/QtSensors/QAltimeter ../../include/QtSensors/QAmbientLightReading ../../include/QtSensors/QAmbientLightFilter ../../include/QtSensors/QAmbientLightSensor ../../include/QtSensors/QAmbientTemperatureReading ../../include/QtSensors/QAmbientTemperatureFilter ../../include/QtSensors/QAmbientTemperatureSensor ../../include/QtSensors/QCompassReading ../../include/QtSensors/QCompassFilter ../../include/QtSensors/QCompass ../../include/QtSensors/QGyroscopeReading ../../include/QtSensors/QGyroscopeFilter ../../include/QtSensors/QGyroscope ../../include/QtSensors/QHolsterReading ../../include/QtSensors/QHolsterFilter ../../include/QtSensors/QHolsterSensor ../../include/QtSensors/QIRProximityReading ../../include/QtSensors/QIRProximityFilter ../../include/QtSensors/QIRProximitySensor ../../include/QtSensors/QLightReading ../../include/QtSensors/QLightFilter ../../include/QtSensors/QLightSensor ../../include/QtSensors/QMagnetometerReading ../../include/QtSensors/QMagnetometerFilter ../../include/QtSensors/QMagnetometer ../../include/QtSensors/QOrientationReading ../../include/QtSensors/QOrientationFilter ../../include/QtSensors/QOrientationSensor ../../include/QtSensors/QPressureReading ../../include/QtSensors/QPressureFilter ../../include/QtSensors/QPressureSensor ../../include/QtSensors/QProximityReading ../../include/QtSensors/QProximityFilter ../../include/QtSensors/QProximitySensor ../../include/QtSensors/QRotationReading ../../include/QtSensors/QRotationFilter ../../include/QtSensors/QRotationSensor ../../include/QtSensors/QSensor ../../include/QtSensors/QSensorFilter ../../include/QtSensors/QSensorReading ../../include/QtSensors/QSensorBackend ../../include/QtSensors/QSensorManager ../../include/QtSensors/QSensorBackendFactory ../../include/QtSensors/QSensorPluginInterface ../../include/QtSensors/QSensorChangesInterface ../../include/QtSensors/QTapReading ../../include/QtSensors/QTapFilter ../../include/QtSensors/QTapSensor ../../include/QtSensors/QTiltReading ../../include/QtSensors/QTiltFilter ../../include/QtSensors/QTiltSensor ../../include/QtSensors/QSensorGesture ../../include/QtSensors/QSensorGestureManager ../../include/QtSensors/QSensorGesturePluginInterface ../../include/QtSensors/QSensorGestureRecognizer ../../include/QtSensors/QtSensorsVersion
-SYNCQT.PRIVATE_HEADER_FILES = qaccelerometer_p.h qaltimeter_p.h qambientlightsensor_p.h qambienttemperaturesensor_p.h qcompass_p.h qgyroscope_p.h qholstersensor_p.h qirproximitysensor_p.h qlightsensor_p.h qmagnetometer_p.h qorientationsensor_p.h qpressuresensor_p.h qproximitysensor_p.h qrotationsensor_p.h qsensor_p.h qsensorbackend_p.h qtapsensor_p.h qtiltsensor_p.h sensorlog_p.h gestures/qsensorgesture_p.h gestures/qsensorgesturemanagerprivate_p.h gestures/simulatorgesturescommon_p.h
-SYNCQT.QPA_HEADER_FILES =
-SYNCQT.INJECTIONS =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qaccelerometer.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qaccelerometer.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qaccelerometer.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qaccelerometer.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qaccelerometer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qaltimeter.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qaltimeter.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qaltimeter.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qaltimeter.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qaltimeter.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qambientlightsensor.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qambientlightsensor.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qambientlightsensor.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qambientlightsensor.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qambientlightsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qambienttemperaturesensor.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qambienttemperaturesensor.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qambienttemperaturesensor.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qambienttemperaturesensor.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qambienttemperaturesensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qcompass.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qcompass.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qcompass.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qcompass.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qcompass.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qgyroscope.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qgyroscope.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qgyroscope.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qgyroscope.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qgyroscope.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qholstersensor.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qholstersensor.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qholstersensor.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qholstersensor.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qholstersensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qirproximitysensor.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qirproximitysensor.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qirproximitysensor.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qirproximitysensor.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qirproximitysensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qlightsensor.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qlightsensor.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qlightsensor.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qlightsensor.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qlightsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qmagnetometer.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qmagnetometer.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qmagnetometer.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qmagnetometer.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qmagnetometer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qorientationsensor.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qorientationsensor.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qorientationsensor.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qorientationsensor.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qorientationsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qpressuresensor.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qpressuresensor.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qpressuresensor.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qpressuresensor.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qpressuresensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qproximitysensor.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qproximitysensor.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qproximitysensor.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qproximitysensor.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qproximitysensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qrotationsensor.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qrotationsensor.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qrotationsensor.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qrotationsensor.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qrotationsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensor.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensor.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensor.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensor.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensorbackend.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensorbackend.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensorbackend.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensorbackend.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qsensorbackend.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensorgesture.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensorgesture.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensorgesture.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensorgesture.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/gestures/qsensorgesture.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensorgesturemanager.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensorgesturemanager.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensorgesturemanager.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensorgesturemanager.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/gestures/qsensorgesturemanager.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensorgestureplugininterface.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensorgestureplugininterface.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensorgestureplugininterface.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensorgestureplugininterface.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/gestures/qsensorgestureplugininterface.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensorgesturerecognizer.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensorgesturerecognizer.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensorgesturerecognizer.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensorgesturerecognizer.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/gestures/qsensorgesturerecognizer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensormanager.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensormanager.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensormanager.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensormanager.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qsensormanager.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensorplugin.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensorplugin.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensorplugin.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensorplugin.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qsensorplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensorsglobal.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensorsglobal.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qsensorsglobal.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qsensorsglobal.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qsensorsglobal.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qtapsensor.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qtapsensor.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qtapsensor.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qtapsensor.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qtapsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qtiltsensor.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qtiltsensor.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qtiltsensor.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qtiltsensor.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/sensors/qtiltsensor.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/include/QtSensors/qtsensorsversion.h new/qtsensors-opensource-src-5.3.2/include/QtSensors/qtsensorsversion.h
--- old/qtsensors-opensource-src-5.3.1/include/QtSensors/qtsensorsversion.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/include/QtSensors/qtsensorsversion.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-/* This file was generated by syncqt. */
-#ifndef QT_QTSENSORS_VERSION_H
-#define QT_QTSENSORS_VERSION_H
-
-#define QTSENSORS_VERSION_STR "5.3.1"
-
-#define QTSENSORS_VERSION 0x050301
-
-#endif // QT_QTSENSORS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp 2014-08-18 09:39:35.000000000 +0200
@@ -74,6 +74,7 @@
bool sensorfwaccelerometer::doConnect()
{
+ Q_ASSERT(m_sensorInterface);
if (m_bufferSize==1)
return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(XYZ)), this, SLOT(slotDataAvailable(XYZ)));
return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(QVector<XYZ>)),this, SLOT(slotFrameAvailable(QVector<XYZ>)));
@@ -96,3 +97,10 @@
m_initDone = false;
initSensor<AccelerometerSensorChannelInterface>(m_initDone);
}
+
+void sensorfwaccelerometer::start()
+{
+ if (reinitIsNeeded)
+ init();
+ SensorfwSensorBase::start();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h 2014-08-18 09:39:35.000000000 +0200
@@ -60,6 +60,7 @@
bool doConnect() Q_DECL_OVERRIDE;
QString sensorName() const Q_DECL_OVERRIDE;
qreal correctionFactor() const Q_DECL_OVERRIDE;
+ void start() Q_DECL_OVERRIDE;
virtual void init();
private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwals.cpp new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwals.cpp
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwals.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwals.cpp 2014-08-18 09:39:35.000000000 +0200
@@ -59,6 +59,8 @@
void Sensorfwals::start()
{
+ if (reinitIsNeeded)
+ init();
if (m_sensorInterface) {
Unsigned data(((ALSSensorChannelInterface*)m_sensorInterface)->lux());
m_reading.setLightLevel(getLightLevel(data.x()));
@@ -81,6 +83,7 @@
bool Sensorfwals::doConnect()
{
+ Q_ASSERT(m_sensorInterface);
return QObject::connect(m_sensorInterface, SIGNAL(ALSChanged(Unsigned)),
this, SLOT(slotDataAvailable(Unsigned)));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwcompass.cpp new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwcompass.cpp
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwcompass.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwcompass.cpp 2014-08-18 09:39:35.000000000 +0200
@@ -70,6 +70,7 @@
bool SensorfwCompass::doConnect()
{
+ Q_ASSERT(m_sensorInterface);
return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(Compass)),
this, SLOT(slotDataAvailable(Compass)));
}
@@ -84,3 +85,10 @@
m_initDone = false;
initSensor<CompassSensorChannelInterface>(m_initDone);
}
+
+void SensorfwCompass::start()
+{
+ if (reinitIsNeeded)
+ init();
+ SensorfwSensorBase::start();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwcompass.h new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwcompass.h
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwcompass.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwcompass.h 2014-08-18 09:39:35.000000000 +0200
@@ -59,6 +59,7 @@
protected:
bool doConnect() Q_DECL_OVERRIDE;
QString sensorName() const Q_DECL_OVERRIDE;
+ void start() Q_DECL_OVERRIDE;
virtual void init();
private:
QCompassReading m_reading;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp 2014-08-18 09:39:35.000000000 +0200
@@ -75,6 +75,7 @@
bool SensorfwGyroscope::doConnect()
{
+ Q_ASSERT(m_sensorInterface);
if (m_bufferSize==1)
return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(XYZ)), this, SLOT(slotDataAvailable(XYZ)));
return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(QVector<XYZ>)),this, SLOT(slotFrameAvailable(QVector<XYZ>)));
@@ -95,3 +96,10 @@
m_initDone = false;
initSensor<GyroscopeSensorChannelInterface>(m_initDone);
}
+
+void SensorfwGyroscope::start()
+{
+ if (reinitIsNeeded)
+ init();
+ SensorfwSensorBase::start();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwgyroscope.h new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwgyroscope.h
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwgyroscope.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwgyroscope.h 2014-08-18 09:39:35.000000000 +0200
@@ -62,6 +62,7 @@
bool doConnect() Q_DECL_OVERRIDE;
QString sensorName() const Q_DECL_OVERRIDE;
qreal correctionFactor() const Q_DECL_OVERRIDE;
+ void start() Q_DECL_OVERRIDE;
virtual void init();
private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.cpp new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.cpp
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.cpp 2014-08-18 09:39:35.000000000 +0200
@@ -67,6 +67,7 @@
bool SensorfwIrProximitySensor::doConnect()
{
+ Q_ASSERT(m_sensorInterface);
return QObject::connect(m_sensorInterface, SIGNAL(reflectanceDataAvailable(Proximity)),
this, SLOT(slotDataAvailable(Proximity)));
}
@@ -83,3 +84,10 @@
m_initDone = false;
initSensor<ProximitySensorChannelInterface>(m_initDone);
}
+
+void SensorfwIrProximitySensor::start()
+{
+ if (reinitIsNeeded)
+ init();
+ SensorfwSensorBase::start();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h 2014-08-18 09:39:35.000000000 +0200
@@ -58,6 +58,7 @@
protected:
bool doConnect() Q_DECL_OVERRIDE;
QString sensorName() const Q_DECL_OVERRIDE;
+ void start() Q_DECL_OVERRIDE;
virtual void init();
private:
QIRProximityReading m_reading;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp 2014-08-18 09:39:35.000000000 +0200
@@ -61,6 +61,7 @@
bool SensorfwLightSensor::doConnect()
{
+ Q_ASSERT(m_sensorInterface);
return QObject::connect(m_sensorInterface, SIGNAL(ALSChanged(Unsigned)),
this, SLOT(slotDataAvailable(Unsigned)));
}
@@ -75,3 +76,10 @@
m_initDone = false;
initSensor<ALSSensorChannelInterface>(m_initDone);
}
+
+void SensorfwLightSensor::start()
+{
+ if (reinitIsNeeded)
+ init();
+ SensorfwSensorBase::start();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwlightsensor.h new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwlightsensor.h
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwlightsensor.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwlightsensor.h 2014-08-18 09:39:35.000000000 +0200
@@ -59,6 +59,7 @@
protected:
bool doConnect() Q_DECL_OVERRIDE;
QString sensorName() const Q_DECL_OVERRIDE;
+ void start() Q_DECL_OVERRIDE;
virtual void init();
private:
QLightReading m_reading;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp 2014-08-18 09:39:35.000000000 +0200
@@ -59,6 +59,8 @@
void SensorfwMagnetometer::start()
{
+ if (reinitIsNeeded)
+ init();
QMagnetometer *const magnetometer = qobject_cast<QMagnetometer *>(sensor());
if (magnetometer)
m_isGeoMagnetometer = magnetometer->returnGeoValues();
@@ -86,6 +88,7 @@
bool SensorfwMagnetometer::doConnect()
{
+ Q_ASSERT(m_sensorInterface);
if (m_bufferSize==1)
return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(MagneticField)),
this, SLOT(slotDataAvailable(MagneticField)));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp 2014-08-18 09:39:35.000000000 +0200
@@ -57,6 +57,8 @@
void SensorfwOrientationSensor::start()
{
+ if (reinitIsNeeded)
+ init();
if (m_sensorInterface) {
Unsigned data(((OrientationSensorChannelInterface*)m_sensorInterface)->orientation());
m_reading.setOrientation(SensorfwOrientationSensor::getOrientation(data.x()));
@@ -76,6 +78,7 @@
bool SensorfwOrientationSensor::doConnect()
{
+ Q_ASSERT(m_sensorInterface);
return QObject::connect(m_sensorInterface, SIGNAL(orientationChanged(Unsigned)),
this, SLOT(slotDataAvailable(Unsigned)));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp 2014-08-18 09:39:35.000000000 +0200
@@ -46,8 +46,8 @@
SensorfwProximitySensor::SensorfwProximitySensor(QSensor *sensor)
: SensorfwSensorBase(sensor),
+ m_initDone(false),
m_exClose(false)
- , m_initDone(false)
{
init();
setReading<QProximityReading>(&m_reading);
@@ -57,6 +57,8 @@
void SensorfwProximitySensor::start()
{
+ if (reinitIsNeeded)
+ init();
if (m_sensorInterface) {
Unsigned data(((ProximitySensorChannelInterface*)m_sensorInterface)->proximity());
m_reading.setClose(data.x()? true: false);
@@ -79,6 +81,7 @@
bool SensorfwProximitySensor::doConnect()
{
+ Q_ASSERT(m_sensorInterface);
return (QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(Unsigned)),
this, SLOT(slotDataAvailable(Unsigned))));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp 2014-08-18 09:39:35.000000000 +0200
@@ -71,6 +71,7 @@
bool SensorfwRotationSensor::doConnect()
{
+ Q_ASSERT(m_sensorInterface);
if (m_bufferSize==1)
return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(XYZ)), this, SLOT(slotDataAvailable(XYZ)));
return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(QVector<XYZ>)),this, SLOT(slotFrameAvailable(QVector<XYZ>)));
@@ -86,3 +87,10 @@
m_initDone = false;
initSensor<RotationSensorChannelInterface>(m_initDone);
}
+
+void SensorfwRotationSensor::start()
+{
+ if (reinitIsNeeded)
+ init();
+ SensorfwSensorBase::start();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h 2014-08-18 09:39:35.000000000 +0200
@@ -61,6 +61,7 @@
protected:
bool doConnect() Q_DECL_OVERRIDE;
QString sensorName() const Q_DECL_OVERRIDE;
+ void start() Q_DECL_OVERRIDE;
virtual void init();
private:
QRotationReading m_reading;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp 2014-08-18 09:39:35.000000000 +0200
@@ -56,6 +56,7 @@
: QSensorBackend(sensor),
m_sensorInterface(0),
m_bufferSize(-1),
+ reinitIsNeeded(false),
m_prevOutputRange(0),
m_efficientBufferSize(1),
m_maxBufferSize(1),
@@ -214,9 +215,16 @@
void SensorfwSensorBase::connectToSensord()
{
m_remoteSensorManager = &SensorManagerInterface::instance();
+ if (!m_remoteSensorManager->isValid()) {
+ qWarning() << "SensorManagerInterface is invalid";
+ m_remoteSensorManager = 0;
+ return;
+ }
if (running) {
stop();
+ reinitIsNeeded = true;
start();
+ reinitIsNeeded = false;
}
}
@@ -225,3 +233,68 @@
m_bufferSize = -1;
}
+bool SensorfwSensorBase::initSensorInterface(QString const &name)
+{
+ if (!m_sensorInterface) {
+ sensorError(KErrNotFound);
+ return false;
+ }
+
+ //metadata
+ const QList<DataRange> intervals = m_sensorInterface->getAvailableIntervals();
+
+ for (int i = 0, l = intervals.size(); i < l; i++) {
+ qreal intervalMax = intervals.at(i).max;
+ qreal intervalMin = intervals.at(i).min;
+
+ if (intervalMin == 0 && intervalMax == 0) {
+ // 0 interval has different meanings in e.g. magge/acce
+ // magge -> best-effort
+ // acce -> lowest possible
+ // in Qt API setting 0 means default
+ continue;
+ }
+
+ qreal rateMin = intervalMax < 1 ? 1 : 1 / intervalMax * 1000;
+ rateMin = rateMin < 1 ? 1 : rateMin;
+
+ intervalMin = intervalMin < 1 ? 10: intervalMin; // do not divide with 0
+ qreal rateMax = 1 / intervalMin * 1000;
+ addDataRate(rateMin, rateMax);
+ }
+
+ //bufferSizes
+ if (m_bufferingSensors.contains(sensor()->identifier())) {
+
+ IntegerRangeList sizes = m_sensorInterface->getAvailableBufferSizes();
+ for (int i = 0; i < sizes.size(); i++) {
+ int second = sizes.at(i).second;
+ m_maxBufferSize = second > m_bufferSize ? second : m_maxBufferSize;
+ }
+ m_maxBufferSize = m_maxBufferSize < 0 ? 1 : m_maxBufferSize;
+ //SensorFW guarantees to provide the most efficient size first
+ //TODO: remove from comments
+ //m_efficientBufferSize = m_sensorInterface->hwBuffering()? (l>0?sizes.at(0).first:1) : 1;
+ } else {
+ m_maxBufferSize = 1;
+ }
+
+ sensor()->setMaxBufferSize(m_maxBufferSize);
+ sensor()->setEfficientBufferSize(m_efficientBufferSize);
+
+ // TODO deztructor: Leaking abstraction detected. Just copied code
+ // from initSensor<>() here, need to
+ QByteArray type = sensor()->type();
+ if ((type == QAmbientLightSensor::type) // SensorFW returns lux values, plugin enumerated values
+ || (type == QIRProximitySensor::type) // SensorFW returns raw reflectance values, plugin % of max reflectance
+ || (name == "accelerometersensor") // SensorFW returns milliGs, plugin m/s^2
+ || (name == "magnetometersensor") // SensorFW returns nanoTeslas, plugin Teslas
+ || (name == "gyroscopesensor")) // SensorFW returns DSPs, plugin milliDSPs
+ return true;
+
+ setDescription(m_sensorInterface->description());
+
+ if (name == "tapsensor") return true;
+ setRanges();
+ return true;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwsensorbase.h new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwsensorbase.h
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwsensorbase.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwsensorbase.h 2014-08-18 09:39:35.000000000 +0200
@@ -77,10 +77,13 @@
template<typename T>
void initSensor(bool &initDone)
{
-
const QString name = sensorName();
if (!initDone) {
+ if (!m_remoteSensorManager) {
+ qDebug() << "There is no sensor manager yet, do not initialize" << name;
+ return;
+ }
if (!m_remoteSensorManager->loadPlugin(name)) {
sensorError(KErrNotFound);
return;
@@ -91,71 +94,7 @@
if (!m_sensorInterface) {
m_sensorInterface = const_cast<T*>(T::listenInterface(name));
}
- if (!m_sensorInterface) {
- sensorError(KErrNotFound);
- return;
- }
- if (!m_sensorInterface) {
- sensorError(KErrNotFound);
- return;
- }
-
- initDone = true;
-
- //metadata
- QList<DataRange> intervals = m_sensorInterface->getAvailableIntervals();
-
- for (int i = 0, l = intervals.size(); i < l; i++) {
- qreal intervalMax = ((DataRange)(intervals.at(i))).max;
- qreal intervalMin =((DataRange)(intervals.at(i))).min;
-
- if (intervalMin == 0 && intervalMax == 0) {
- // 0 interval has different meanings in e.g. magge/acce
- // magge -> best-effort
- // acce -> lowest possible
- // in Qt API setting 0 means default
- continue;
- }
-
- qreal rateMin = intervalMax < 1 ? 1 : 1 / intervalMax * 1000;
- rateMin = rateMin < 1 ? 1 : rateMin;
-
- intervalMin = intervalMin < 1 ? 10: intervalMin; // do not divide with 0
- qreal rateMax = 1 / intervalMin * 1000;
- addDataRate(rateMin, rateMax);
- }
-
- //bufferSizes
- if (m_bufferingSensors.contains(sensor()->identifier())) {
-
- IntegerRangeList sizes = m_sensorInterface->getAvailableBufferSizes();
- int l = sizes.size();
- for (int i = 0; i < l; i++) {
- int second = sizes.at(i).second;
- m_maxBufferSize = second > m_bufferSize ? second : m_maxBufferSize;
- }
- m_maxBufferSize = m_maxBufferSize < 0 ? 1 : m_maxBufferSize;
- //SensorFW guarantees to provide the most efficient size first
- //TODO: remove from comments
- //m_efficientBufferSize = m_sensorInterface->hwBuffering()? (l>0?sizes.at(0).first:1) : 1;
- }
- else
- m_maxBufferSize = 1;
-
- sensor()->setMaxBufferSize(m_maxBufferSize);
- sensor()->setEfficientBufferSize(m_efficientBufferSize);
-
- QByteArray type = sensor()->type();
- if (type == QAmbientLightSensor::type) return; // SensorFW returns lux values, plugin enumerated values
- if (type == QIRProximitySensor::type) return; // SensorFW returns raw reflectance values, plugin % of max reflectance
- if (name == "accelerometersensor") return; // SensorFW returns milliGs, plugin m/s^2
- if (name == "magnetometersensor") return; // SensorFW returns nanoTeslas, plugin Teslas
- if (name == "gyroscopesensor") return; // SensorFW returns DSPs, plugin milliDSPs
-
- setDescription(m_sensorInterface->description());
-
- if (name == "tapsensor") return;
- setRanges();
+ initDone = initSensorInterface(name);
};
@@ -163,9 +102,10 @@
int m_bufferSize;
int bufferSize() const;
virtual qreal correctionFactor() const;
+ bool reinitIsNeeded;
private:
-
+ bool initSensorInterface(QString const &);
static SensorManagerInterface* m_remoteSensorManager;
int m_prevOutputRange;
bool doConnectAfterCheck();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwtapsensor.cpp new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwtapsensor.cpp
--- old/qtsensors-opensource-src-5.3.1/src/plugins/sensors/sensorfw/sensorfwtapsensor.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/plugins/sensors/sensorfw/sensorfwtapsensor.cpp 2014-08-18 09:39:35.000000000 +0200
@@ -45,8 +45,8 @@
SensorfwTapSensor::SensorfwTapSensor(QSensor *sensor)
: SensorfwSensorBase(sensor),
+ m_initDone(false),
m_isOnceStarted(false)
- , m_initDone(false)
{
init();
setReading<QTapReading>(&m_reading);
@@ -58,6 +58,9 @@
void SensorfwTapSensor::start()
{
+ if (reinitIsNeeded)
+ init();
+
QTapSensor * const tapSensor = qobject_cast<QTapSensor *>(sensor());
bool b = tapSensor->returnDoubleTapEvents();
@@ -68,9 +71,14 @@
}
else m_isDoubleTapSensor = b;
- if (!m_isOnceStarted || (m_isOnceStarted && isDoubleTapSensor != m_isDoubleTapSensor))
- ((TapSensorChannelInterface*)m_sensorInterface)->
- setTapType(m_isDoubleTapSensor?TapSensorChannelInterface::Double:TapSensorChannelInterface::Single);
+ if (!m_isOnceStarted || (m_isOnceStarted && isDoubleTapSensor != m_isDoubleTapSensor)) {
+ TapSensorChannelInterface *iface = static_cast<TapSensorChannelInterface *>(m_sensorInterface);
+ if (!iface) {
+ qWarning() << "Sensor interface is not initialized";
+ return;
+ }
+ iface->setTapType(m_isDoubleTapSensor?TapSensorChannelInterface::Double:TapSensorChannelInterface::Single);
+ }
SensorfwSensorBase::start();
// Set tap type (single/double)
@@ -103,6 +111,7 @@
bool SensorfwTapSensor::doConnect()
{
+ Q_ASSERT(m_sensorInterface);
return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(Tap)),
this, SLOT(slotDataAvailable(Tap)));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/sensors/gestures/qsensorgesturemanagerprivate_p.h new/qtsensors-opensource-src-5.3.2/src/sensors/gestures/qsensorgesturemanagerprivate_p.h
--- old/qtsensors-opensource-src-5.3.1/src/sensors/gestures/qsensorgesturemanagerprivate_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/sensors/gestures/qsensorgesturemanagerprivate_p.h 2014-08-18 09:39:35.000000000 +0200
@@ -42,6 +42,17 @@
#ifndef QSENSORGESTUREMANAGERPRIVATE_P_H
#define QSENSORGESTUREMANAGERPRIVATE_P_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#include <QObject>
#include <QMap>
#include <QStringList>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/sensors/qcompass.cpp new/qtsensors-opensource-src-5.3.2/src/sensors/qcompass.cpp
--- old/qtsensors-opensource-src-5.3.1/src/sensors/qcompass.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/sensors/qcompass.cpp 2014-08-18 09:39:35.000000000 +0200
@@ -74,7 +74,7 @@
\property QCompassReading::azimuth
\brief the azimuth of the device.
- Measured in degrees from magnetic north in a clockwise direction based
+ Measured in degrees from magnetic north in a clockwise direction based on
the top of the UI.
\sa {QCompassReading Units}
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/src/sensors/qsensormanager.cpp new/qtsensors-opensource-src-5.3.2/src/sensors/qsensormanager.cpp
--- old/qtsensors-opensource-src-5.3.1/src/sensors/qsensormanager.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/src/sensors/qsensormanager.cpp 2014-08-18 09:39:35.000000000 +0200
@@ -48,12 +48,15 @@
#include "sensorlog_p.h"
#include <QTimer>
#include <QFile>
+#include <QLoggingCategory>
QT_BEGIN_NAMESPACE
typedef QHash<QByteArray,QSensorBackendFactory*> FactoryForIdentifierMap;
typedef QHash<QByteArray,FactoryForIdentifierMap> BackendIdentifiersForTypeMap;
+static QLoggingCategory sensorsCategory("qt.sensors");
+
class QSensorManagerPrivate : public QObject
{
friend class QSensorManager;
@@ -77,7 +80,6 @@
loadExternalPlugins = false;
}
}
-
bool loadExternalPlugins;
PluginLoadingState pluginLoadingState;
QFactoryLoader *loader;
@@ -101,9 +103,16 @@
if (config.isEmpty()) return; // QStandardPaths is broken?
config += QLatin1String("/QtProject/Sensors.conf");
#endif
- if (!QFile::exists(config)) return;
+ qCDebug(sensorsCategory) << "Loading config from" << config;
+ if (!QFile::exists(config)) {
+ qCDebug(sensorsCategory) << "There is no config file" << config;
+ return;
+ }
QFile cfgfile(config);
- if (!cfgfile.open(QFile::ReadOnly)) return;
+ if (!cfgfile.open(QFile::ReadOnly)) {
+ qCWarning(sensorsCategory) << "Can't open config file" << config;
+ return;
+ }
QTextStream stream(&cfgfile);
QString line;
@@ -167,15 +176,21 @@
Q_GLOBAL_STATIC(QSensorManagerPrivate, sensorManagerPrivate)
-static void initPlugin(QObject *o)
+static void initPlugin(QObject *o, bool warnOnFail = true)
{
- if (!o) return;
+ qCDebug(sensorsCategory) << "Init plugin" << o;
+ if (!o) {
+ qCWarning(sensorsCategory) << "Null plugin" << o;
+ return;
+ }
QSensorManagerPrivate *d = sensorManagerPrivate();
if (!d) return; // hardly likely but just in case...
- if (d->seenPlugins.contains(o))
+ if (d->seenPlugins.contains(o)) {
+ qCDebug(sensorsCategory) << "Plugin is seen" << o;
return;
+ }
QSensorChangesInterface *changes = qobject_cast<QSensorChangesInterface*>(o);
if (changes)
@@ -184,8 +199,11 @@
QSensorPluginInterface *plugin = qobject_cast<QSensorPluginInterface*>(o);
if (plugin) {
+ qCDebug(sensorsCategory) << "Register sensors for " << plugin;
d->seenPlugins.insert(o);
plugin->registerSensors();
+ } else if (warnOnFail) {
+ qCWarning(sensorsCategory) << "Can't cast to plugin" << o;
}
}
@@ -198,7 +216,7 @@
SENSORLOG() << "initializing static plugins";
// Qt-style static plugins
Q_FOREACH (QObject *plugin, QPluginLoader::staticInstances()) {
- initPlugin(plugin);
+ initPlugin(plugin, false/*do not warn on fail*/);
}
if (d->loadExternalPlugins) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-opensource-src-5.3.1/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h new/qtsensors-opensource-src-5.3.2/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h
--- old/qtsensors-opensource-src-5.3.1/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h 2014-06-19 12:08:33.000000000 +0200
+++ new/qtsensors-opensource-src-5.3.2/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h 2014-08-18 09:39:35.000000000 +0200
@@ -42,6 +42,17 @@
#ifndef QTESTSENSORGESTUREPLUGIN_P_H
#define QTESTSENSORGESTUREPLUGIN_P_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#include <QObject>
#include <qsensorgestureplugininterface.h>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qtscript for openSUSE:Factory checked in at 2014-09-08 21:28:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtscript (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtscript.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtscript"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtscript/libqt5-qtscript.changes 2014-06-30 21:50:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtscript.new/libqt5-qtscript.changes 2014-09-08 21:28:46.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2~git20140904 (r11ca348):
+ * Tip of the bugfix 5.3.2 branch:
+ * Work around ICC optimizer bug hoisting conditions
+ out of the loop
+ * Fix crash when creating a QScriptEngine in a native thread
+ * Bump version
+
+-------------------------------------------------------------------
Old:
----
qtscript-opensource-src-5.3.1.tar.xz
New:
----
qtscript-opensource-src-5.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtscript.spec ++++++
--- /var/tmp/diff_new_pack.YBb8vh/_old 2014-09-08 21:28:47.000000000 +0200
+++ /var/tmp/diff_new_pack.YBb8vh/_new 2014-09-08 21:28:47.000000000 +0200
@@ -16,25 +16,21 @@
#
-%define qt5_snapshot 0
+%define qt5_snapshot 1
%define libname libQt5Script5
Name: libqt5-qtscript
-Version: 5.3.1
+Version: 5.3.2~git20140904
Release: 0
Summary: Qt 5 QtScript 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 qtscript-%{real_version}
-%else
+%define real_version 5.3.2
+%define so_version 5.3.2
%define tar_version qtscript-opensource-src-%{real_version}
-%endif
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM ppc64le-support.diff uweigand(a)de.ibm.com -- add support for ppc64le
@@ -61,11 +57,7 @@
handling.
%prep
-%if %qt5_snapshot
-%setup -q -n qtscript-%{real_version}
-%else
%setup -q -n qtscript-opensource-src-%{real_version}
-%endif
%patch1 -p1
%patch2 -p1
++++++ qtscript-opensource-src-5.3.1.tar.xz -> qtscript-opensource-src-5.3.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/.qmake.conf new/qtscript-opensource-src-5.3.2/.qmake.conf
--- old/qtscript-opensource-src-5.3.1/.qmake.conf 2014-06-19 12:07:55.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/.qmake.conf 2014-07-03 03:56:10.000000000 +0200
@@ -1,4 +1,4 @@
load(qt_build_config)
CONFIG += qt_example_installs
-MODULE_VERSION = 5.3.1
+MODULE_VERSION = 5.3.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/.tag new/qtscript-opensource-src-5.3.2/.tag
--- old/qtscript-opensource-src-5.3.1/.tag 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/.tag 2014-07-03 03:56:10.000000000 +0200
@@ -1 +1 @@
-2b71f5f2ce41deb9baf91df2db9ec568e98814e8
+11ca34818ad9a982f653cfd727f1b7d677efa9a9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptable_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptable_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptable_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptable_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/api/qscriptable_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptactivationobject_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptactivationobject_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptactivationobject_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptactivationobject_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/bridge/qscriptactivationobject_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptast_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptast_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptast_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptast_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/parser/qscriptast_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptastfwd_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptastfwd_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptastfwd_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptastfwd_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/parser/qscriptastfwd_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptastvisitor_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptastvisitor_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptastvisitor_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptastvisitor_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/parser/qscriptastvisitor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptclassobject_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptclassobject_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptclassobject_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptclassobject_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/bridge/qscriptclassobject_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptcontext_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptcontext_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptcontext_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptcontext_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/api/qscriptcontext_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptdeclarativeclass_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptdeclarativeclass_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptdeclarativeclass_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptdeclarativeclass_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/bridge/qscriptdeclarativeclass_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptdeclarativeobject_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptdeclarativeobject_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptdeclarativeobject_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptdeclarativeobject_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/bridge/qscriptdeclarativeobject_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptengine_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptengine_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptengine_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptengine_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/api/qscriptengine_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptengineagent_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptengineagent_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptengineagent_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptengineagent_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/api/qscriptengineagent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptfunction_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptfunction_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptfunction_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptfunction_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/bridge/qscriptfunction_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptglobalobject_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptglobalobject_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptglobalobject_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptglobalobject_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/bridge/qscriptglobalobject_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptgrammar_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptgrammar_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptgrammar_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptgrammar_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/parser/qscriptgrammar_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptlexer_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptlexer_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptlexer_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptlexer_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/parser/qscriptlexer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptobject_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptobject_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptobject_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptobject_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/bridge/qscriptobject_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptparser_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptparser_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptparser_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptparser_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/parser/qscriptparser_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptprogram_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptprogram_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptprogram_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptprogram_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/api/qscriptprogram_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptqobject_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptqobject_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptqobject_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptqobject_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/bridge/qscriptqobject_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptstaticscopeobject_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptstaticscopeobject_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptstaticscopeobject_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptstaticscopeobject_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/bridge/qscriptstaticscopeobject_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptstring_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptstring_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptstring_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptstring_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/api/qscriptstring_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptsyntaxchecker_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptsyntaxchecker_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptsyntaxchecker_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptsyntaxchecker_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/parser/qscriptsyntaxchecker_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptvalue_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptvalue_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptvalue_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptvalue_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/api/qscriptvalue_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptvariant_p.h new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptvariant_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/5.3.1/QtScript/private/qscriptvariant_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/5.3.1/QtScript/private/qscriptvariant_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/script/bridge/qscriptvariant_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptClass new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptClass
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptClass 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptClass 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptclass.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptClassPropertyIterator new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptClassPropertyIterator
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptClassPropertyIterator 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptClassPropertyIterator 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptclasspropertyiterator.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptContext new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptContext
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptContext 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptContext 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptcontext.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptContextInfo new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptContextInfo
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptContextInfo 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptContextInfo 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptcontextinfo.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptContextInfoList new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptContextInfoList
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptContextInfoList 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptContextInfoList 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptcontextinfo.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptEngine new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptEngine
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptEngine 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptEngine 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptengine.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptEngineAgent new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptEngineAgent
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptEngineAgent 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptEngineAgent 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptengineagent.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptExtensionInterface new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptExtensionInterface
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptExtensionInterface 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptExtensionInterface 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptextensioninterface.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptExtensionPlugin new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptExtensionPlugin
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptExtensionPlugin 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptExtensionPlugin 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptextensionplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptProgram new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptProgram
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptProgram 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptProgram 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptprogram.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptString new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptString
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptString 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptString 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptstring.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptSyntaxCheckResult new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptSyntaxCheckResult
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptSyntaxCheckResult 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptSyntaxCheckResult 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptengine.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptValue new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptValue
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptValue 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptValue 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptvalue.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptValueIterator new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptValueIterator
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptValueIterator 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptValueIterator 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptvalueiterator.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptValueList new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptValueList
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptValueList 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptValueList 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptvalue.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptable new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptable
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QScriptable 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QScriptable 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptable.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QtScript new/qtscript-opensource-src-5.3.2/include/QtScript/QtScript
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QtScript 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QtScript 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-#ifndef QT_QTSCRIPT_MODULE_H
-#define QT_QTSCRIPT_MODULE_H
-#include <QtScript/QtScriptDepends>
-#include "qscriptable.h"
-#include "qscriptclass.h"
-#include "qscriptclasspropertyiterator.h"
-#include "qscriptcontext.h"
-#include "qscriptcontextinfo.h"
-#include "qscriptengine.h"
-#include "qscriptengineagent.h"
-#include "qscriptextensioninterface.h"
-#include "qscriptextensionplugin.h"
-#include "qscriptprogram.h"
-#include "qscriptstring.h"
-#include "qscriptvalue.h"
-#include "qscriptvalueiterator.h"
-#include "qtscriptglobal.h"
-#include "qtscriptversion.h"
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/QtScriptVersion new/qtscript-opensource-src-5.3.2/include/QtScript/QtScriptVersion
--- old/qtscript-opensource-src-5.3.1/include/QtScript/QtScriptVersion 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/QtScriptVersion 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qtscriptversion.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/headers.pri new/qtscript-opensource-src-5.3.2/include/QtScript/headers.pri
--- old/qtscript-opensource-src-5.3.1/include/QtScript/headers.pri 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/headers.pri 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-SYNCQT.HEADER_FILES = api/qscriptable.h api/qscriptclass.h api/qscriptclasspropertyiterator.h api/qscriptcontext.h api/qscriptcontextinfo.h api/qscriptengine.h api/qscriptengineagent.h api/qscriptextensioninterface.h api/qscriptextensionplugin.h api/qscriptprogram.h api/qscriptstring.h api/qscriptvalue.h api/qscriptvalueiterator.h api/qtscriptglobal.h ../../include/QtScript/qtscriptversion.h ../../include/QtScript/QtScript
-SYNCQT.HEADER_CLASSES = ../../include/QtScript/QScriptable ../../include/QtScript/QScriptClass ../../include/QtScript/QScriptClassPropertyIterator ../../include/QtScript/QScriptContext ../../include/QtScript/QScriptContextInfo ../../include/QtScript/QScriptContextInfoList ../../include/QtScript/QScriptSyntaxCheckResult ../../include/QtScript/QScriptEngine ../../include/QtScript/QScriptEngineAgent ../../include/QtScript/QScriptExtensionInterface ../../include/QtScript/QScriptExtensionPlugin ../../include/QtScript/QScriptProgram ../../include/QtScript/QScriptString ../../include/QtScript/QScriptValueList ../../include/QtScript/QScriptValue ../../include/QtScript/QScriptValueIterator ../../include/QtScript/QtScriptVersion
-SYNCQT.PRIVATE_HEADER_FILES = api/qscriptable_p.h api/qscriptcontext_p.h api/qscriptengine_p.h api/qscriptengineagent_p.h api/qscriptprogram_p.h api/qscriptstring_p.h api/qscriptvalue_p.h bridge/qscriptactivationobject_p.h bridge/qscriptclassobject_p.h bridge/qscriptdeclarativeclass_p.h bridge/qscriptdeclarativeobject_p.h bridge/qscriptfunction_p.h bridge/qscriptglobalobject_p.h bridge/qscriptobject_p.h bridge/qscriptqobject_p.h bridge/qscriptstaticscopeobject_p.h bridge/qscriptvariant_p.h parser/qscriptast_p.h parser/qscriptastfwd_p.h parser/qscriptastvisitor_p.h parser/qscriptgrammar_p.h parser/qscriptlexer_p.h parser/qscriptparser_p.h parser/qscriptsyntaxchecker_p.h
-SYNCQT.QPA_HEADER_FILES =
-SYNCQT.INJECTIONS =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptable.h new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptable.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptable.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptable.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/script/api/qscriptable.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptclass.h new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptclass.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptclass.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptclass.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/script/api/qscriptclass.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptclasspropertyiterator.h new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptclasspropertyiterator.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptclasspropertyiterator.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptclasspropertyiterator.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/script/api/qscriptclasspropertyiterator.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptcontext.h new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptcontext.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptcontext.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptcontext.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/script/api/qscriptcontext.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptcontextinfo.h new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptcontextinfo.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptcontextinfo.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptcontextinfo.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/script/api/qscriptcontextinfo.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptengine.h new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptengine.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptengine.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptengine.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/script/api/qscriptengine.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptengineagent.h new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptengineagent.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptengineagent.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptengineagent.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/script/api/qscriptengineagent.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptextensioninterface.h new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptextensioninterface.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptextensioninterface.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptextensioninterface.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/script/api/qscriptextensioninterface.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptextensionplugin.h new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptextensionplugin.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptextensionplugin.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptextensionplugin.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/script/api/qscriptextensionplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptprogram.h new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptprogram.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptprogram.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptprogram.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/script/api/qscriptprogram.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptstring.h new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptstring.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptstring.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptstring.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/script/api/qscriptstring.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptvalue.h new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptvalue.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptvalue.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptvalue.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/script/api/qscriptvalue.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptvalueiterator.h new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptvalueiterator.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/qscriptvalueiterator.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/qscriptvalueiterator.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/script/api/qscriptvalueiterator.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/qtscriptglobal.h new/qtscript-opensource-src-5.3.2/include/QtScript/qtscriptglobal.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/qtscriptglobal.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/qtscriptglobal.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/script/api/qtscriptglobal.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScript/qtscriptversion.h new/qtscript-opensource-src-5.3.2/include/QtScript/qtscriptversion.h
--- old/qtscript-opensource-src-5.3.1/include/QtScript/qtscriptversion.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScript/qtscriptversion.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-/* This file was generated by syncqt. */
-#ifndef QT_QTSCRIPT_VERSION_H
-#define QT_QTSCRIPT_VERSION_H
-
-#define QTSCRIPT_VERSION_STR "5.3.1"
-
-#define QTSCRIPT_VERSION 0x050301
-
-#endif // QT_QTSCRIPT_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointdata_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointdata_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointdata_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointdata_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptbreakpointdata_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointsmodel_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointsmodel_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointsmodel_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointsmodel_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptbreakpointsmodel_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointswidget_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointswidget_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointswidget_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointswidget_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptbreakpointswidget_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointswidgetinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointswidgetinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointswidgetinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointswidgetinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointswidgetinterface_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointswidgetinterface_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointswidgetinterface_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptbreakpointswidgetinterface_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletionproviderinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletionproviderinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletionproviderinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletionproviderinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptcompletionproviderinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletiontask_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletiontask_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletiontask_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletiontask_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptcompletiontask_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletiontaskinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletiontaskinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletiontaskinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletiontaskinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptcompletiontaskinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletiontaskinterface_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletiontaskinterface_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletiontaskinterface_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptcompletiontaskinterface_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptcompletiontaskinterface_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugger_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugger_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugger_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugger_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebugger_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggeragent_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggeragent_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggeragent_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggeragent_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggeragent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggeragent_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggeragent_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggeragent_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggeragent_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggeragent_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerbackend_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerbackend_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerbackend_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerbackend_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerbackend_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerbackend_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerbackend_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerbackend_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerbackend_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerbackend_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodefinderwidget_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodefinderwidget_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodefinderwidget_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodefinderwidget_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodefinderwidgetinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodefinderwidgetinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodefinderwidgetinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodefinderwidgetinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodefinderwidgetinterface_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodefinderwidgetinterface_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodefinderwidgetinterface_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodefinderwidgetinterface_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodeview_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodeview_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodeview_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodeview_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggercodeview_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodeviewinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodeviewinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodeviewinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodeviewinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodeviewinterface_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodeviewinterface_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodeviewinterface_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodeviewinterface_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodewidget_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodewidget_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodewidget_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodewidget_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggercodewidget_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodewidgetinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodewidgetinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodewidgetinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodewidgetinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodewidgetinterface_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodewidgetinterface_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodewidgetinterface_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercodewidgetinterface_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommand_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommand_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommand_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommand_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggercommand_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandexecutor_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandexecutor_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandexecutor_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandexecutor_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerfrontend_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerfrontend_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerfrontend_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerfrontend_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggercommandschedulerinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerjob_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerjob_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerjob_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerjob_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerjob_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerjob_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerjob_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggercommandschedulerjob_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsole_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsole_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsole_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsole_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerconsole_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommand_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommand_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommand_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommand_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommand_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommand_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommand_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommand_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerconsolecommand_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandgroupdata_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandgroupdata_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandgroupdata_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandgroupdata_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandjob_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandjob_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandjob_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandjob_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandjob_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandjob_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandjob_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandjob_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandmanager_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandmanager_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandmanager_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolecommandmanager_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsoleglobalobject_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsoleglobalobject_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsoleglobalobject_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsoleglobalobject_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolehistorianinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolehistorianinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolehistorianinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolehistorianinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerconsolehistorianinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolewidget_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolewidget_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolewidget_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolewidget_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolewidgetinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolewidgetinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolewidgetinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolewidgetinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolewidgetinterface_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolewidgetinterface_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolewidgetinterface_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerconsolewidgetinterface_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerevent_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerevent_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerevent_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerevent_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerevent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggereventhandlerinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggereventhandlerinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggereventhandlerinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggereventhandlerinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggereventhandlerinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerfrontend_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerfrontend_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerfrontend_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerfrontend_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerfrontend_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerfrontend_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerfrontend_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerfrontend_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerfrontend_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerfrontend_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerjob_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerjob_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerjob_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerjob_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerjob_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerjob_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerjob_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerjob_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerjob_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerjob_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerjobschedulerinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerjobschedulerinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerjobschedulerinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerjobschedulerinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerjobschedulerinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalsmodel_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalsmodel_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalsmodel_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalsmodel_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalswidget_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalswidget_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalswidget_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalswidget_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalswidgetinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalswidgetinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalswidgetinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalswidgetinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalswidgetinterface_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalswidgetinterface_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalswidgetinterface_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerlocalswidgetinterface_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerobjectsnapshotdelta_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerobjectsnapshotdelta_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerobjectsnapshotdelta_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerobjectsnapshotdelta_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerobjectsnapshotdelta_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerresponse_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerresponse_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerresponse_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerresponse_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerresponse_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerresponsehandlerinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerresponsehandlerinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerresponsehandlerinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerresponsehandlerinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerresponsehandlerinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptedconsolecommand_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptedconsolecommand_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptedconsolecommand_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptedconsolecommand_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptsmodel_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptsmodel_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptsmodel_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptsmodel_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptswidget_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptswidget_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptswidget_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptswidget_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptswidgetinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptswidgetinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptswidgetinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptswidgetinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptswidgetinterface_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptswidgetinterface_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptswidgetinterface_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerscriptswidgetinterface_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackmodel_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackmodel_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackmodel_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackmodel_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerstackmodel_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackwidget_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackwidget_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackwidget_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackwidget_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerstackwidget_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackwidgetinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackwidgetinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackwidgetinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackwidgetinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackwidgetinterface_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackwidgetinterface_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackwidgetinterface_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstackwidgetinterface_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstandardwidgetfactory_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstandardwidgetfactory_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstandardwidgetfactory_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerstandardwidgetfactory_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerstandardwidgetfactory_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggervalue_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggervalue_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggervalue_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggervalue_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggervalue_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggervalueproperty_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggervalueproperty_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggervalueproperty_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggervalueproperty_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggervalueproperty_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerwidgetfactoryinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerwidgetfactoryinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerwidgetfactoryinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebuggerwidgetfactoryinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebuggerwidgetfactoryinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugoutputwidget_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugoutputwidget_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugoutputwidget_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugoutputwidget_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebugoutputwidget_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugoutputwidgetinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugoutputwidgetinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugoutputwidgetinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugoutputwidgetinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugoutputwidgetinterface_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugoutputwidgetinterface_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugoutputwidgetinterface_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptdebugoutputwidgetinterface_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptedit_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptedit_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptedit_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptedit_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptedit_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptenginedebuggerfrontend_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptenginedebuggerfrontend_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptenginedebuggerfrontend_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptenginedebuggerfrontend_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripterrorlogwidget_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripterrorlogwidget_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripterrorlogwidget_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripterrorlogwidget_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscripterrorlogwidget_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripterrorlogwidgetinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripterrorlogwidgetinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripterrorlogwidgetinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripterrorlogwidgetinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripterrorlogwidgetinterface_p_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripterrorlogwidgetinterface_p_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripterrorlogwidgetinterface_p_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripterrorlogwidgetinterface_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscripterrorlogwidgetinterface_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptmessagehandlerinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptmessagehandlerinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptmessagehandlerinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptmessagehandlerinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptmessagehandlerinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptobjectsnapshot_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptobjectsnapshot_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptobjectsnapshot_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptobjectsnapshot_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptobjectsnapshot_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptscriptdata_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptscriptdata_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptscriptdata_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptscriptdata_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptscriptdata_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptstdmessagehandler_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptstdmessagehandler_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptstdmessagehandler_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptstdmessagehandler_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptstdmessagehandler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptsyntaxhighlighter_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptsyntaxhighlighter_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptsyntaxhighlighter_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptsyntaxhighlighter_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptsyntaxhighlighter_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripttooltipproviderinterface_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripttooltipproviderinterface_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripttooltipproviderinterface_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscripttooltipproviderinterface_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscripttooltipproviderinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptvalueproperty_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptvalueproperty_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptvalueproperty_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptvalueproperty_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptvalueproperty_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptxmlparser_p.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptxmlparser_p.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptxmlparser_p.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/5.3.1/QtScriptTools/private/qscriptxmlparser_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/scripttools/debugging/qscriptxmlparser_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/QScriptEngineDebugger new/qtscript-opensource-src-5.3.2/include/QtScriptTools/QScriptEngineDebugger
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/QScriptEngineDebugger 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/QScriptEngineDebugger 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qscriptenginedebugger.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/QtScriptTools new/qtscript-opensource-src-5.3.2/include/QtScriptTools/QtScriptTools
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/QtScriptTools 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/QtScriptTools 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-#ifndef QT_QTSCRIPTTOOLS_MODULE_H
-#define QT_QTSCRIPTTOOLS_MODULE_H
-#include <QtScriptTools/QtScriptToolsDepends>
-#include "qscriptenginedebugger.h"
-#include "qtscripttoolsversion.h"
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/QtScriptToolsVersion new/qtscript-opensource-src-5.3.2/include/QtScriptTools/QtScriptToolsVersion
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/QtScriptToolsVersion 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/QtScriptToolsVersion 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "qtscripttoolsversion.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/headers.pri new/qtscript-opensource-src-5.3.2/include/QtScriptTools/headers.pri
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/headers.pri 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/headers.pri 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-SYNCQT.HEADER_FILES = debugging/qscriptenginedebugger.h ../../include/QtScriptTools/qtscripttoolsversion.h ../../include/QtScriptTools/QtScriptTools
-SYNCQT.HEADER_CLASSES = ../../include/QtScriptTools/QScriptEngineDebugger ../../include/QtScriptTools/QtScriptToolsVersion
-SYNCQT.PRIVATE_HEADER_FILES = debugging/qscriptbreakpointdata_p.h debugging/qscriptbreakpointsmodel_p.h debugging/qscriptbreakpointswidget_p.h debugging/qscriptbreakpointswidgetinterface_p.h debugging/qscriptbreakpointswidgetinterface_p_p.h debugging/qscriptcompletionproviderinterface_p.h debugging/qscriptcompletiontask_p.h debugging/qscriptcompletiontaskinterface_p.h debugging/qscriptcompletiontaskinterface_p_p.h debugging/qscriptdebugger_p.h debugging/qscriptdebuggeragent_p.h debugging/qscriptdebuggeragent_p_p.h debugging/qscriptdebuggerbackend_p.h debugging/qscriptdebuggerbackend_p_p.h debugging/qscriptdebuggercodefinderwidget_p.h debugging/qscriptdebuggercodefinderwidgetinterface_p.h debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h debugging/qscriptdebuggercodeview_p.h debugging/qscriptdebuggercodeviewinterface_p.h debugging/qscriptdebuggercodeviewinterface_p_p.h debugging/qscriptdebuggercodewidget_p.h debugging/qscriptdebuggercodewidgetinterface_p.h debugging/qscriptdebuggercodewidgetinterface_p_p.h debugging/qscriptdebuggercommand_p.h debugging/qscriptdebuggercommandexecutor_p.h debugging/qscriptdebuggercommandschedulerfrontend_p.h debugging/qscriptdebuggercommandschedulerinterface_p.h debugging/qscriptdebuggercommandschedulerjob_p.h debugging/qscriptdebuggercommandschedulerjob_p_p.h debugging/qscriptdebuggerconsole_p.h debugging/qscriptdebuggerconsolecommand_p.h debugging/qscriptdebuggerconsolecommand_p_p.h debugging/qscriptdebuggerconsolecommandgroupdata_p.h debugging/qscriptdebuggerconsolecommandjob_p.h debugging/qscriptdebuggerconsolecommandjob_p_p.h debugging/qscriptdebuggerconsolecommandmanager_p.h debugging/qscriptdebuggerconsoleglobalobject_p.h debugging/qscriptdebuggerconsolehistorianinterface_p.h debugging/qscriptdebuggerconsolewidget_p.h debugging/qscriptdebuggerconsolewidgetinterface_p.h debugging/qscriptdebuggerconsolewidgetinterface_p_p.h debugging/qscriptdebuggerevent_p.h debugging/qscriptdebuggereventhandlerinterface_p.h debugging/qscriptdebuggerfrontend_p.h debugging/qscriptdebuggerfrontend_p_p.h debugging/qscriptdebuggerjob_p.h debugging/qscriptdebuggerjob_p_p.h debugging/qscriptdebuggerjobschedulerinterface_p.h debugging/qscriptdebuggerlocalsmodel_p.h debugging/qscriptdebuggerlocalswidget_p.h debugging/qscriptdebuggerlocalswidgetinterface_p.h debugging/qscriptdebuggerlocalswidgetinterface_p_p.h debugging/qscriptdebuggerobjectsnapshotdelta_p.h debugging/qscriptdebuggerresponse_p.h debugging/qscriptdebuggerresponsehandlerinterface_p.h debugging/qscriptdebuggerscriptedconsolecommand_p.h debugging/qscriptdebuggerscriptsmodel_p.h debugging/qscriptdebuggerscriptswidget_p.h debugging/qscriptdebuggerscriptswidgetinterface_p.h debugging/qscriptdebuggerscriptswidgetinterface_p_p.h debugging/qscriptdebuggerstackmodel_p.h debugging/qscriptdebuggerstackwidget_p.h debugging/qscriptdebuggerstackwidgetinterface_p.h debugging/qscriptdebuggerstackwidgetinterface_p_p.h debugging/qscriptdebuggerstandardwidgetfactory_p.h debugging/qscriptdebuggervalue_p.h debugging/qscriptdebuggervalueproperty_p.h debugging/qscriptdebuggerwidgetfactoryinterface_p.h debugging/qscriptdebugoutputwidget_p.h debugging/qscriptdebugoutputwidgetinterface_p.h debugging/qscriptdebugoutputwidgetinterface_p_p.h debugging/qscriptedit_p.h debugging/qscriptenginedebuggerfrontend_p.h debugging/qscripterrorlogwidget_p.h debugging/qscripterrorlogwidgetinterface_p.h debugging/qscripterrorlogwidgetinterface_p_p.h debugging/qscriptmessagehandlerinterface_p.h debugging/qscriptobjectsnapshot_p.h debugging/qscriptscriptdata_p.h debugging/qscriptstdmessagehandler_p.h debugging/qscriptsyntaxhighlighter_p.h debugging/qscripttooltipproviderinterface_p.h debugging/qscriptvalueproperty_p.h debugging/qscriptxmlparser_p.h
-SYNCQT.QPA_HEADER_FILES =
-SYNCQT.INJECTIONS =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/qscriptenginedebugger.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/qscriptenginedebugger.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/qscriptenginedebugger.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/qscriptenginedebugger.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../src/scripttools/debugging/qscriptenginedebugger.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/include/QtScriptTools/qtscripttoolsversion.h new/qtscript-opensource-src-5.3.2/include/QtScriptTools/qtscripttoolsversion.h
--- old/qtscript-opensource-src-5.3.1/include/QtScriptTools/qtscripttoolsversion.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/include/QtScriptTools/qtscripttoolsversion.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-/* This file was generated by syncqt. */
-#ifndef QT_QTSCRIPTTOOLS_VERSION_H
-#define QT_QTSCRIPTTOOLS_VERSION_H
-
-#define QTSCRIPTTOOLS_VERSION_STR "5.3.1"
-
-#define QTSCRIPTTOOLS_VERSION 0x050301
-
-#endif // QT_QTSCRIPTTOOLS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp new/qtscript-opensource-src-5.3.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp
--- old/qtscript-opensource-src-5.3.1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp 2014-07-03 03:56:10.000000000 +0200
@@ -2635,8 +2635,11 @@
}
void* TCMalloc_Central_FreeList::FetchFromSpans() {
- if (DLL_IsEmpty(&nonempty_)) return NULL;
+// Intel compiler bug; issue id 6000056746
+// if (DLL_IsEmpty(&nonempty_)) return NULL;
Span* span = nonempty_.next;
+ if (span == &nonempty_)
+ return NULL;
ASSERT(span->objects != NULL);
ASSERT_SPAN_COMMITTED(span);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscript-opensource-src-5.3.1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h new/qtscript-opensource-src-5.3.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h
--- old/qtscript-opensource-src-5.3.1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h 2014-06-19 12:07:56.000000000 +0200
+++ new/qtscript-opensource-src-5.3.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h 2014-07-03 03:56:10.000000000 +0200
@@ -256,7 +256,8 @@
#endif
#if PLATFORM(QT)
// See comment as above
- data->owner->m_key.setLocalData(data);
+ if (!data->owner->m_key.hasLocalData())
+ data->owner->m_key.setLocalData(data);
#endif
data->value->~T();
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qtquick1 for openSUSE:Factory checked in at 2014-09-08 21:28:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtquick1 (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtquick1.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtquick1"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtquick1/libqt5-qtquick1.changes 2014-06-30 21:50:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtquick1.new/libqt5-qtquick1.changes 2014-09-08 21:28:44.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2~git20140904 (r3074a3a):
+ * Tip of the bugfix 5.3.2 branch:
+ * Compile fix: do not use composeMode() if QT_NO_IM is defined
+ * qmlplugindumper: do not pop up a window if an assert
+ is triggered, QTCREATORBUG-12644
+
+-------------------------------------------------------------------
Old:
----
qtquick1-opensource-src-5.3.1.tar.xz
New:
----
qtquick1-opensource-src-5.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtquick1.spec ++++++
--- /var/tmp/diff_new_pack.HlJFPa/_old 2014-09-08 21:28:46.000000000 +0200
+++ /var/tmp/diff_new_pack.HlJFPa/_new 2014-09-08 21:28:46.000000000 +0200
@@ -16,12 +16,12 @@
#
-%define qt5_snapshot 0
+%define qt5_snapshot 1
%define libname libQt5Declarative5
Name: libqt5-qtquick1
-Version: 5.3.1
+Version: 5.3.2~git20140904
Release: 0
Summary: Qt 5 Quick1 Library
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
@@ -30,13 +30,9 @@
BuildRequires: fdupes
%define base_name libqt5
-%define real_version 5.3.1
-%define so_version 5.3.1
-%if %qt5_snapshot
-%define tar_version qtquick1-%{real_version}
-%else
+%define real_version 5.3.2
+%define so_version 5.3.2
%define tar_version qtquick1-opensource-src-%{real_version}
-%endif
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
%if %qt5_snapshot
@@ -64,11 +60,7 @@
handling.
%prep
-%if %qt5_snapshot
-%setup -q -n qtquick1-%{real_version}
-%else
%setup -q -n qtquick1-opensource-src-%{real_version}
-%endif
%package -n %libname
Summary: Qt 5 Quick1 Library
++++++ qtquick1-opensource-src-5.3.1.tar.xz -> qtquick1-opensource-src-5.3.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qtquick1/qtquick1-opensource-src-5.3.1.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtquick1.new/qtquick1-opensource-src-5.3.2.tar.xz differ: char 17, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qtmultimedia for openSUSE:Factory checked in at 2014-09-08 21:28:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtmultimedia (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtmultimedia.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtmultimedia"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtmultimedia/libqt5-qtmultimedia.changes 2014-06-30 21:50:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtmultimedia.new/libqt5-qtmultimedia.changes 2014-09-08 21:28:41.000000000 +0200
@@ -1,0 +2,13 @@
+Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2~git20140904 (r6e39a79):
+ * Tip of the bugfix 5.3.2 branch
+ * MediaPlayer's loops property now works correctly when
+ playing a media from a qrc file.
+ * [QTBUG-29742] Fixed Qt apps hanging when audio APIs are
+ used and PulseAudio is not running.
+ * [QTBUG-39949] Fixed QMediaRecorder::setOutputLocation() not
+ working with QUrl::fromLocalFile().
+- Rebase Initial-porting-effort-to-GStreamer-1.0.patch
+
+-------------------------------------------------------------------
Old:
----
qtmultimedia-opensource-src-5.3.1.tar.xz
New:
----
qtmultimedia-opensource-src-5.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtmultimedia.spec ++++++
--- /var/tmp/diff_new_pack.JXStdp/_old 2014-09-08 21:28:42.000000000 +0200
+++ /var/tmp/diff_new_pack.JXStdp/_new 2014-09-08 21:28:42.000000000 +0200
@@ -16,25 +16,21 @@
#
-%define qt5_snapshot 0
+%define qt5_snapshot 1
%define libname libQt5Multimedia5
Name: libqt5-qtmultimedia
-Version: 5.3.1
+Version: 5.3.2~git20140904
Release: 0
Summary: Qt 5 Multimedia 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 qtmultimedia-%{real_version}
-%else
+%define real_version 5.3.2
+%define so_version 5.3.2
%define tar_version qtmultimedia-opensource-src-%{real_version}
-%endif
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM Initial-porting-effort-to-GStreamer-1.0.patch -- support building with gstreamer 1.0 API (taken from upstream wip/gstreamer-1.0 branch)
@@ -80,11 +76,7 @@
handling.
%prep
-%if %qt5_snapshot
-%setup -q -n qtmultimedia-%{real_version}
-%else
%setup -q -n qtmultimedia-opensource-src-%{real_version}
-%endif
%if 0%{?suse_version} >= 1315
%patch0 -p1
%endif
++++++ Initial-porting-effort-to-GStreamer-1.0.patch ++++++
--- /var/tmp/diff_new_pack.JXStdp/_old 2014-09-08 21:28:42.000000000 +0200
+++ /var/tmp/diff_new_pack.JXStdp/_new 2014-09-08 21:28:42.000000000 +0200
@@ -1,69 +1,3 @@
-From 9bae6a95a312bfd691cac6f4cc5d59759b7835ec Mon Sep 17 00:00:00 2001
-From: Yoann Lopes <yoann.lopes(a)digia.com>
-Date: Thu, 31 Oct 2013 15:06:30 +0100
-Subject: [PATCH 1/1] Initial porting effort to GStreamer 1.0.
-
-Imported from git@github.com:jhodapp/qtmultimedia.git
-
-Contributions from:
-Ilya Smelykh <ilya(a)videoexpertsgroup.com>
-Jim Hodapp <jim.hodapp(a)canonical.com>
-Sergio Schvezov <sergio.schvezov(a)canonical.com>
-
-Change-Id: I10fa5e5078efa4564ce833befd417008e26a90a9
-Reviewed-by: Yoann Lopes <yoann.lopes(a)digia.com>
-(cherry picked from commit d91dac090d92fdbc3a3425e8d969c62e5c79eff9)
-
-Conflicts:
- src/gsttools/qgstreamervideorenderer.cpp
- src/gsttools/qgstreamervideowidget.cpp
- src/gsttools/qgstreamervideowindow.cpp
- src/plugins/gstreamer/camerabin/camerabinsession.cpp
- src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
- src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
----
- config.tests/gstreamer/gstreamer.pro | 11 +-
- config.tests/gstreamer_appsrc/gstreamer_appsrc.pro | 13 +-
- .../gstreamer_encodingprofiles.pro | 13 +-
- .../gstreamer_photography.pro | 15 +-
- qtmultimedia.pro | 22 +-
- src/gsttools/gsttools.pro | 33 +-
- src/gsttools/gstvideoconnector.c | 199 +++++++++++-
- src/gsttools/qgstappsrc.cpp | 29 +-
- src/gsttools/qgstreameraudioprobecontrol.cpp | 19 +-
- src/gsttools/qgstreamerbushelper.cpp | 8 +
- src/gsttools/qgstreamermirtexturerenderer.cpp | 360 +++++++++++++++++++++
- src/gsttools/qgstreamervideoprobecontrol.cpp | 9 +
- src/gsttools/qgstreamervideorenderer.cpp | 3 +-
- src/gsttools/qgstreamervideowidget.cpp | 29 +-
- src/gsttools/qgstreamervideowindow.cpp | 79 ++++-
- src/gsttools/qgstutils.cpp | 25 +-
- src/gsttools/qgstvideobuffer.cpp | 18 +-
- src/gsttools/qvideosurfacegstsink.cpp | 143 +++++++-
- src/multimedia/gsttools_headers/qgstappsrc_p.h | 3 +
- .../qgstreameraudioprobecontrol_p.h | 5 +-
- .../qgstreamermirtexturerenderer_p.h | 111 +++++++
- .../qgstreamervideoprobecontrol_p.h | 4 +
- .../gsttools_headers/qgstreamervideowindow_p.h | 4 +
- src/multimedia/gsttools_headers/qgstutils_p.h | 4 +
- .../gsttools_headers/qgstvideobuffer_p.h | 3 +
- .../gsttools_headers/qvideosurfacegstsink_p.h | 6 +-
- .../qgstreameraudiodecoderserviceplugin.cpp | 27 +-
- .../audiodecoder/qgstreameraudiodecodersession.cpp | 33 +-
- .../gstreamer/camerabin/camerabinsession.cpp | 25 ++
- src/plugins/gstreamer/common.pri | 21 +-
- src/plugins/gstreamer/gstreamer.pro | 3 +-
- .../mediacapture/qgstreamercapturesession.cpp | 5 +
- src/plugins/gstreamer/mediaplayer/mediaplayer.pro | 1 -
- .../mediaplayer/qgstreamerplayercontrol.cpp | 2 +
- .../mediaplayer/qgstreamerplayerservice.cpp | 9 +-
- .../mediaplayer/qgstreamerplayerserviceplugin.cpp | 27 +-
- .../mediaplayer/qgstreamerplayersession.cpp | 154 ++++++++-
- .../mediaplayer/qgstreamerplayersession.h | 9 +
- 38 files changed, 1354 insertions(+), 130 deletions(-)
- create mode 100644 src/gsttools/qgstreamermirtexturerenderer.cpp
- create mode 100644 src/multimedia/gsttools_headers/qgstreamermirtexturerenderer_p.h
-
diff --git a/config.tests/gstreamer/gstreamer.pro b/config.tests/gstreamer/gstreamer.pro
index 02a7e34..6b9843a 100644
--- a/config.tests/gstreamer/gstreamer.pro
@@ -153,10 +87,10 @@
+LIBS += -lgstphotography-$$GST_VERSION
diff --git a/qtmultimedia.pro b/qtmultimedia.pro
-index 1deaab2..0b7b4fc 100644
+index 3cec526..109dd81 100644
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
-@@ -21,10 +21,24 @@ win32 {
+@@ -17,11 +17,26 @@ win32 {
} else {
qtCompileTest(alsa)
qtCompileTest(pulseaudio)
@@ -164,6 +98,7 @@
- qtCompileTest(gstreamer_photography)
- qtCompileTest(gstreamer_encodingprofiles)
- qtCompileTest(gstreamer_appsrc)
+- qtCompileTest(linux_v4l)
+ !done_config_gstreamer {
+ gstver=1.0
+ cache(GST_VERSION, set, gstver);
@@ -171,6 +106,7 @@
+ qtCompileTest(gstreamer_photography)
+ qtCompileTest(gstreamer_encodingprofiles)
+ qtCompileTest(gstreamer_appsrc)
++ qtCompileTest(linux_v4l)
+ } else {
+ gstver=0.10
+ cache(GST_VERSION, set, gstver);
@@ -180,13 +116,14 @@
+ qtCompileTest(gstreamer_photography)
+ qtCompileTest(gstreamer_encodingprofiles)
+ qtCompileTest(gstreamer_appsrc)
++ qtCompileTest(linux_v4l)
+ }
+ }
}
qtCompileTest(resourcepolicy)
qtCompileTest(gpu_vivante)
diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro
-index 15edd04..d252344 100644
+index 7c809a7..6b9bf5d 100644
--- a/src/gsttools/gsttools.pro
+++ b/src/gsttools/gsttools.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
@@ -243,7 +180,7 @@
+ LIBS_PRIVATE += -lgstapp-$$GST_VERSION
}
- HEADERS += $$PRIVATE_HEADERS
+ config_linux_v4l: DEFINES += USE_V4L
diff --git a/src/gsttools/gstvideoconnector.c b/src/gsttools/gstvideoconnector.c
index 3e08fe5..ff3f9a3 100644
--- a/src/gsttools/gstvideoconnector.c
@@ -1702,10 +1639,10 @@
if (m_duration != duration) {
m_duration = duration;
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
-index 6e3448f..0dbf848 100644
+index a835b1c..6bd3682 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
-@@ -726,7 +726,11 @@ qint64 CameraBinSession::duration() const
+@@ -731,7 +731,11 @@ qint64 CameraBinSession::duration() const
GstFormat format = GST_FORMAT_TIME;
gint64 duration = 0;
@@ -1717,7 +1654,7 @@
return duration / 1000000;
else
return 0;
-@@ -759,8 +763,13 @@ void CameraBinSession::setMetaData(const QMap<QByteArray, QVariant> &data)
+@@ -764,8 +768,13 @@ void CameraBinSession::setMetaData(const QMap<QByteArray, QVariant> &data)
if (m_camerabin) {
GstIterator *elements = gst_bin_iterate_all_by_interface(GST_BIN(m_camerabin), GST_TYPE_TAG_SETTER);
@@ -1731,7 +1668,7 @@
gst_tag_setter_reset_tags(GST_TAG_SETTER(element));
QMapIterator<QByteArray, QVariant> it(data);
-@@ -821,7 +830,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message)
+@@ -826,7 +835,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message)
if (gm && GST_MESSAGE_TYPE(gm) == GST_MESSAGE_ELEMENT) {
if (m_captureMode == QCamera::CaptureStillImage &&
@@ -1743,7 +1680,7 @@
st = gst_message_get_structure(gm);
if (gst_structure_has_field_typed(st, "buffer", GST_TYPE_BUFFER)) {
-@@ -831,7 +844,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message)
+@@ -836,7 +849,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message)
QImage img;
@@ -1755,7 +1692,7 @@
if (caps) {
GstStructure *structure = gst_caps_get_structure(caps, 0);
gint width = 0;
-@@ -1103,7 +1120,11 @@ QList< QPair<int,int> > CameraBinSession::supportedFrameRates(const QSize &frame
+@@ -1109,7 +1126,11 @@ QList< QPair<int,int> > CameraBinSession::supportedFrameRates(const QSize &frame
gst_structure_remove_all_fields(structure);
gst_structure_set_value(structure, "framerate", &rate);
}
@@ -1767,7 +1704,7 @@
for (uint i=0; i<gst_caps_get_size(caps); i++) {
-@@ -1223,7 +1244,11 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate,
+@@ -1229,7 +1250,11 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate,
gst_structure_set_value(structure, "width", &w);
gst_structure_set_value(structure, "height", &h);
}
@@ -1837,10 +1774,10 @@
OTHER_FILES += \
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
-index 518a66b..0c99502 100644
+index b9114c6..97d9203 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
-@@ -504,6 +504,11 @@ GstElement *QGstreamerCaptureSession::buildImageCapture()
+@@ -506,6 +506,11 @@ GstElement *QGstreamerCaptureSession::buildImageCapture()
gst_pad_add_buffer_probe(pad, G_CALLBACK(passImageFilter), this);
gst_object_unref(GST_OBJECT(pad));
@@ -1862,7 +1799,7 @@
mediaplayer.json
-
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
-index ff99aa3..f9de6a7 100644
+index 99c471b..deec236 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
@@ -527,6 +527,8 @@ void QGstreamerPlayerControl::processEOS()
@@ -1958,7 +1895,7 @@
GstStaticPadTemplate *padtemplate = (GstStaticPadTemplate*)(pads->data);
pads = g_list_next (pads);
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
-index 27446e0..579bd2b 100644
+index 87b71d7..03185a2 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
@@ -93,6 +93,16 @@ typedef enum {
@@ -2183,7 +2120,7 @@
foreach (const QByteArray &rawHeader, self->m_request.rawHeaderList()) {
if (rawHeader == userAgentString) // Filter User-Agent
-@@ -1629,7 +1691,11 @@ GstAutoplugSelectResult QGstreamerPlayerSession::handleAutoplugSelect(GstBin *bi
+@@ -1630,7 +1692,11 @@ GstAutoplugSelectResult QGstreamerPlayerSession::handleAutoplugSelect(GstBin *bi
const gchar *factoryName = gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(factory));
if (g_str_has_prefix(factoryName, "vaapi")) {
GstPad *sinkPad = gst_element_get_static_pad(session->m_videoSink, "sink");
@@ -2195,7 +2132,7 @@
#if (GST_VERSION_MAJOR == 0) && ((GST_VERSION_MINOR < 10) || (GST_VERSION_MICRO < 33))
if (!factory_can_src_any_caps(factory, sinkCaps))
-@@ -1658,14 +1724,19 @@ void QGstreamerPlayerSession::handleElementAdded(GstBin *bin, GstElement *elemen
+@@ -1659,14 +1725,19 @@ void QGstreamerPlayerSession::handleElementAdded(GstBin *bin, GstElement *elemen
// Disable on-disk buffering.
g_object_set(G_OBJECT(element), "temp-template", NULL, NULL);
} else if (g_str_has_prefix(elementName, "uridecodebin") ||
@@ -2217,7 +2154,7 @@
}
//listen for queue2 element added to uridecodebin/decodebin2 as well.
-@@ -1733,7 +1804,27 @@ void QGstreamerPlayerSession::removeProbe(QGstreamerVideoProbeControl* probe)
+@@ -1734,7 +1805,27 @@ void QGstreamerPlayerSession::removeProbe(QGstreamerVideoProbeControl* probe)
// Assume user releases any outstanding references to video frames.
}
@@ -2246,7 +2183,7 @@
{
Q_UNUSED(pad);
-@@ -1748,6 +1839,7 @@ gboolean QGstreamerPlayerSession::padVideoBufferProbe(GstPad *pad, GstBuffer *bu
+@@ -1749,6 +1840,7 @@ gboolean QGstreamerPlayerSession::padVideoBufferProbe(GstPad *pad, GstBuffer *bu
return TRUE;
}
@@ -2254,7 +2191,7 @@
void QGstreamerPlayerSession::addProbe(QGstreamerAudioProbeControl* probe)
{
-@@ -1765,6 +1857,24 @@ void QGstreamerPlayerSession::removeProbe(QGstreamerAudioProbeControl* probe)
+@@ -1766,6 +1858,24 @@ void QGstreamerPlayerSession::removeProbe(QGstreamerAudioProbeControl* probe)
m_audioProbes.removeOne(probe);
}
@@ -2279,7 +2216,7 @@
gboolean QGstreamerPlayerSession::padAudioBufferProbe(GstPad *pad, GstBuffer *buffer, gpointer user_data)
{
Q_UNUSED(pad);
-@@ -1780,7 +1890,7 @@ gboolean QGstreamerPlayerSession::padAudioBufferProbe(GstPad *pad, GstBuffer *bu
+@@ -1781,7 +1891,7 @@ gboolean QGstreamerPlayerSession::padAudioBufferProbe(GstPad *pad, GstBuffer *bu
return TRUE;
}
@@ -2288,7 +2225,7 @@
// This function is similar to stop(),
// but does not set m_everPlayed, m_lastPosition,
// and setSeekable() values.
-@@ -1813,7 +1923,11 @@ void QGstreamerPlayerSession::removeVideoBufferProbe()
+@@ -1814,7 +1924,11 @@ void QGstreamerPlayerSession::removeVideoBufferProbe()
GstPad *pad = gst_element_get_static_pad(m_videoSink, "sink");
if (pad) {
@@ -2300,7 +2237,7 @@
gst_object_unref(GST_OBJECT(pad));
}
-@@ -1828,7 +1942,11 @@ void QGstreamerPlayerSession::addVideoBufferProbe()
+@@ -1829,7 +1943,11 @@ void QGstreamerPlayerSession::addVideoBufferProbe()
GstPad *pad = gst_element_get_static_pad(m_videoSink, "sink");
if (pad) {
@@ -2312,7 +2249,7 @@
gst_object_unref(GST_OBJECT(pad));
}
}
-@@ -1845,7 +1963,11 @@ void QGstreamerPlayerSession::removeAudioBufferProbe()
+@@ -1846,7 +1964,11 @@ void QGstreamerPlayerSession::removeAudioBufferProbe()
GstPad *pad = gst_element_get_static_pad(m_audioSink, "sink");
if (pad) {
@@ -2324,7 +2261,7 @@
gst_object_unref(GST_OBJECT(pad));
}
-@@ -1860,7 +1982,11 @@ void QGstreamerPlayerSession::addAudioBufferProbe()
+@@ -1861,7 +1983,11 @@ void QGstreamerPlayerSession::addAudioBufferProbe()
GstPad *pad = gst_element_get_static_pad(m_audioSink, "sink");
if (pad) {
@@ -2336,7 +2273,7 @@
gst_object_unref(GST_OBJECT(pad));
}
}
-@@ -1893,7 +2019,7 @@ void QGstreamerPlayerSession::playlistTypeFindFunction(GstTypeFind *find, gpoint
+@@ -1894,7 +2020,7 @@ void QGstreamerPlayerSession::playlistTypeFindFunction(GstTypeFind *find, gpoint
length = qMin(length, guint64(1024));
while (length > 0) {
@@ -2377,6 +2314,3 @@
};
QT_END_NAMESPACE
---
-1.9.1
-
++++++ qtmultimedia-opensource-src-5.3.1.tar.xz -> qtmultimedia-opensource-src-5.3.2.tar.xz ++++++
++++ 7790 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qtlocation for openSUSE:Factory checked in at 2014-09-08 21:28:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtlocation (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtlocation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtlocation"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtlocation/libqt5-qtlocation.changes 2014-06-30 21:50:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtlocation.new/libqt5-qtlocation.changes 2014-09-08 21:28:38.000000000 +0200
@@ -1,0 +2,22 @@
+Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2~git20140904 (r6e39a79):
+ * Tip of the bugfix 5.3.2 branch
+ * OSX: Fix QGeoPositionInfo attribute values with
+ corelocation plug-in
+ * Don't hang weatherinfo if position source has an error.
+ * Enforce the use of test.source position plug-in
+ in auto tests
+ * Report error when failing to connect to Geoclue.
+ * Add changelog for QtPositioning 5.3.2 release.
+ * Fix fitViewportToMapItemsRefine
+ * Avoid potential double deletion when handling
+ OSM route replies
+ * Fix QGeoRouteReplyOsm::networkReplyFinished
+ * Fix issues with MapItemView.
+ * Fixed symbol clash between sensor and positioning
+ plug-in on iOS
+ * Fix the names of the plugin factory classes for
+ static plugin loading
+
+-------------------------------------------------------------------
Old:
----
qtlocation-opensource-src-5.3.1.tar.xz
New:
----
qtlocation-opensource-src-5.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtlocation.spec ++++++
--- /var/tmp/diff_new_pack.TJ5SFm/_old 2014-09-08 21:28:39.000000000 +0200
+++ /var/tmp/diff_new_pack.TJ5SFm/_new 2014-09-08 21:28:39.000000000 +0200
@@ -16,25 +16,21 @@
#
-%define qt5_snapshot 0
+%define qt5_snapshot 1
%define libname libQt5Positioning5
Name: libqt5-qtlocation
-Version: 5.3.1
+Version: 5.3.2~git20140904
Release: 0
Summary: Qt 5 Location Addon
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 qtlocation-%{real_version}
-%else
+%define real_version 5.3.2
+%define so_version 5.3.2
%define tar_version qtlocation-opensource-src-%{real_version}
-%endif
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
BuildRequires: fdupes
@@ -54,11 +50,7 @@
Qt is a set of libraries for developing applications.
%prep
-%if %qt5_snapshot
-%setup -q -n qtlocation-%{real_version}
-%else
%setup -q -n qtlocation-opensource-src-%{real_version}
-%endif
%package -n %libname
Summary: Qt 5 Location Addon
@@ -119,6 +111,8 @@
# kill .la files
rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
+%fdupes -s %{buildroot}%{_libqt5_examplesdir}/
+
%files -n %libname
%defattr(-,root,root,755)
%doc *.txt LICENSE.*
++++++ qtlocation-opensource-src-5.3.1.tar.xz -> qtlocation-opensource-src-5.3.2.tar.xz ++++++
++++ 1791 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qtimageformats for openSUSE:Factory checked in at 2014-09-08 21:28:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtimageformats (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtimageformats.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtimageformats"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtimageformats/libqt5-qtimageformats.changes 2014-06-30 21:50:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtimageformats.new/libqt5-qtimageformats.changes 2014-09-08 21:28:36.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2~git20140904 (rcccf0de):
+ * Tip of the bugfix 5.3.2 branch
+ * Fix DDS image writing
+ * Remove some material with questionable copyright
+
+-------------------------------------------------------------------
Old:
----
qtimageformats-opensource-src-5.3.1.tar.xz
New:
----
qtimageformats-opensource-src-5.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtimageformats.spec ++++++
--- /var/tmp/diff_new_pack.Lp7FTl/_old 2014-09-08 21:28:37.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp7FTl/_new 2014-09-08 21:28:37.000000000 +0200
@@ -16,23 +16,19 @@
#
-%define qt5_snapshot 0
+%define qt5_snapshot 1
Name: libqt5-qtimageformats
-Version: 5.3.1
+Version: 5.3.2~git20140904
Release: 0
Summary: Qt 5 Image Format Plugins
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 qtimageformats-%{real_version}
-%else
+%define real_version 5.3.2
+%define so_version 5.3.2
%define tar_version qtimageformats-opensource-src-%{real_version}
-%endif
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
BuildRequires: libjasper-devel
@@ -45,7 +41,7 @@
BuildRequires: perl
%endif
BuildRequires: xz
-Requires: libQt5Gui5
+%requires_ge libQt5Gui5
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -74,11 +70,7 @@
%prep
-%if %qt5_snapshot
-%setup -q -n qtimageformats-%{real_version}
-%else
%setup -q -n qtimageformats-opensource-src-%{real_version}
-%endif
%build
%if %qt5_snapshot
++++++ qtimageformats-opensource-src-5.3.1.tar.xz -> qtimageformats-opensource-src-5.3.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-opensource-src-5.3.1/.qmake.conf new/qtimageformats-opensource-src-5.3.2/.qmake.conf
--- old/qtimageformats-opensource-src-5.3.1/.qmake.conf 2014-06-19 12:08:33.000000000 +0200
+++ new/qtimageformats-opensource-src-5.3.2/.qmake.conf 2014-09-03 08:55:37.000000000 +0200
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.3.1
+MODULE_VERSION = 5.3.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-opensource-src-5.3.1/.tag new/qtimageformats-opensource-src-5.3.2/.tag
--- old/qtimageformats-opensource-src-5.3.1/.tag 2014-06-19 12:08:34.000000000 +0200
+++ new/qtimageformats-opensource-src-5.3.2/.tag 2014-09-03 08:55:37.000000000 +0200
@@ -1 +1 @@
-1c66c5786c35a7d841e0004757cff06da3f9a2cc
+cccf0deca06a7ffa4534ce75e8d4cdb5f20a8b92
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-opensource-src-5.3.1/src/plugins/imageformats/dds/qddshandler.cpp new/qtimageformats-opensource-src-5.3.2/src/plugins/imageformats/dds/qddshandler.cpp
--- old/qtimageformats-opensource-src-5.3.1/src/plugins/imageformats/dds/qddshandler.cpp 2014-06-19 12:08:34.000000000 +0200
+++ new/qtimageformats-opensource-src-5.3.2/src/plugins/imageformats/dds/qddshandler.cpp 2014-09-03 08:55:37.000000000 +0200
@@ -1338,9 +1338,9 @@
dds.pixelFormat.bBitMask = 0x000000ff;
s << dds;
- for (int width = 0; width < image.width(); width++) {
- for (int height = 0; height < image.height(); height++) {
- QRgb pixel = image.pixel(height, width);;
+ for (int height = 0; height < image.height(); height++) {
+ for (int width = 0; width < image.width(); width++) {
+ QRgb pixel = image.pixel(width, height);
quint32 color;
quint8 alpha = qAlpha(pixel);
quint8 red = qRed(pixel);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-opensource-src-5.3.1/tests/auto/dds/tst_qdds.cpp new/qtimageformats-opensource-src-5.3.2/tests/auto/dds/tst_qdds.cpp
--- old/qtimageformats-opensource-src-5.3.1/tests/auto/dds/tst_qdds.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtimageformats-opensource-src-5.3.2/tests/auto/dds/tst_qdds.cpp 2014-09-03 08:55:37.000000000 +0200
@@ -109,6 +109,7 @@
QTest::newRow("46") << QString("RXGB") << QSize(64, 64);
QTest::newRow("47") << QString("ATI2") << QSize(64, 64);
QTest::newRow("48") << QString("P4") << QSize(64, 64);
+ QTest::newRow("49") << QString("A8R8G8B8_2") << QSize(64, 32);
}
void tst_qdds::readImage()
@@ -158,6 +159,7 @@
QTest::addColumn<QSize>("size");
QTest::newRow("1") << QString("A8R8G8B8") << QSize(64, 64);
+ QTest::newRow("2") << QString("A8R8G8B8_2") << QSize(64, 32);
}
void tst_qdds::testWriteImage()
Files old/qtimageformats-opensource-src-5.3.1/tests/auto/webp/images/lena.jpg and new/qtimageformats-opensource-src-5.3.2/tests/auto/webp/images/lena.jpg differ
Files old/qtimageformats-opensource-src-5.3.1/tests/auto/webp/images/lena.webp and new/qtimageformats-opensource-src-5.3.2/tests/auto/webp/images/lena.webp differ
Files old/qtimageformats-opensource-src-5.3.1/tests/auto/webp/images/lena_lossless.webp and new/qtimageformats-opensource-src-5.3.2/tests/auto/webp/images/lena_lossless.webp differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-opensource-src-5.3.1/tests/auto/webp/tst_qwebp.cpp new/qtimageformats-opensource-src-5.3.2/tests/auto/webp/tst_qwebp.cpp
--- old/qtimageformats-opensource-src-5.3.1/tests/auto/webp/tst_qwebp.cpp 2014-06-19 12:08:33.000000000 +0200
+++ new/qtimageformats-opensource-src-5.3.2/tests/auto/webp/tst_qwebp.cpp 2014-09-03 08:55:37.000000000 +0200
@@ -58,8 +58,6 @@
QTest::addColumn<QString>("fileName");
QTest::addColumn<QSize>("size");
- QTest::newRow("lena") << QString("lena") << QSize(103, 103);
- QTest::newRow("lena_lossless") << QString("lena_lossless") << QSize(103, 103);
QTest::newRow("kollada") << QString("kollada") << QSize(436, 160);
QTest::newRow("kollada_lossless") << QString("kollada_lossless") << QSize(436, 160);
}
@@ -85,8 +83,6 @@
QTest::addColumn<QSize>("size");
QTest::addColumn<bool>("needcheck");
- QTest::newRow("lena-90") << QString("lena") << QString(".jpg") << 90 << QSize(103, 103) << false;
- QTest::newRow("lena-100") << QString("lena") << QString(".jpg") << 100 << QSize(103, 103) << false;
QTest::newRow("kollada-75") << QString("kollada") << QString(".png") << 75 << QSize(436, 160) << false;
QTest::newRow("kollada-100") << QString("kollada") << QString(".png") << 100 << QSize(436, 160) << true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-opensource-src-5.3.1/tests/auto/webp/webp.qrc new/qtimageformats-opensource-src-5.3.2/tests/auto/webp/webp.qrc
--- old/qtimageformats-opensource-src-5.3.1/tests/auto/webp/webp.qrc 2014-06-19 12:08:33.000000000 +0200
+++ new/qtimageformats-opensource-src-5.3.2/tests/auto/webp/webp.qrc 2014-09-03 08:55:37.000000000 +0200
@@ -1,8 +1,5 @@
<RCC>
<qresource prefix="/">
- <file>images/lena.jpg</file>
- <file>images/lena.webp</file>
- <file>images/lena_lossless.webp</file>
<file>images/kollada.png</file>
<file>images/kollada.webp</file>
<file>images/kollada_lossless.webp</file>
Files old/qtimageformats-opensource-src-5.3.1/tests/shared/images/dds/A8R8G8B8_2.dds and new/qtimageformats-opensource-src-5.3.2/tests/shared/images/dds/A8R8G8B8_2.dds differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-opensource-src-5.3.1/tests/shared/images/dds.qrc new/qtimageformats-opensource-src-5.3.2/tests/shared/images/dds.qrc
--- old/qtimageformats-opensource-src-5.3.1/tests/shared/images/dds.qrc 2014-06-19 12:08:33.000000000 +0200
+++ new/qtimageformats-opensource-src-5.3.2/tests/shared/images/dds.qrc 2014-09-03 08:55:37.000000000 +0200
@@ -49,5 +49,6 @@
<file>dds/YUY2.dds</file>
<file>dds/RXGB.dds</file>
<file>dds/ATI2.dds</file>
+ <file>dds/A8R8G8B8_2.dds</file>
</qresource>
</RCC>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qtgraphicaleffects for openSUSE:Factory checked in at 2014-09-08 21:28:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtgraphicaleffects (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtgraphicaleffects.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtgraphicaleffects"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtgraphicaleffects/libqt5-qtgraphicaleffects.changes 2014-06-30 21:50:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtgraphicaleffects.new/libqt5-qtgraphicaleffects.changes 2014-09-08 21:28:34.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2~git20140904 (rca99f8c):
+ * Tip of the bugfix 5.3.2 branch
+ * Version bump to 5.3.2
+
+-------------------------------------------------------------------
Old:
----
qtgraphicaleffects-opensource-src-5.3.1.tar.xz
New:
----
qtgraphicaleffects-opensource-src-5.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtgraphicaleffects.spec ++++++
--- /var/tmp/diff_new_pack.N9YkEY/_old 2014-09-08 21:28:35.000000000 +0200
+++ /var/tmp/diff_new_pack.N9YkEY/_new 2014-09-08 21:28:35.000000000 +0200
@@ -16,23 +16,19 @@
#
-%define qt5_snapshot 0
+%define qt5_snapshot 1
Name: libqt5-qtgraphicaleffects
-Version: 5.3.1
+Version: 5.3.2~git20140904
Release: 0
Summary: Qt 5 Graphical Effects
License: BSD-3-Clause and (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 qtgraphicaleffects-%{real_version}
-%else
+%define real_version 5.3.2
+%define so_version 5.3.2
%define tar_version qtgraphicaleffects-opensource-src-%{real_version}
-%endif
Source: %{tar_version}.tar.xz
BuildRequires: libqt5-qtdeclarative-devel >= %{version}
%if %qt5_snapshot
@@ -40,7 +36,7 @@
BuildRequires: perl
%endif
BuildRequires: xz
-Requires: libQtQuick5
+%requires_ge libQtQuick5
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -51,11 +47,7 @@
handling.
%prep
-%if %qt5_snapshot
-%setup -q -n qtgraphicaleffects-%{real_version}
-%else
%setup -q -n qtgraphicaleffects-opensource-src-%{real_version}
-%endif
%build
%if %qt5_snapshot
++++++ qtgraphicaleffects-opensource-src-5.3.1.tar.xz -> qtgraphicaleffects-opensource-src-5.3.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qtgraphicaleffects/qtgraphicaleffects-opensource-src-5.3.1.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtgraphicaleffects.new/qtgraphicaleffects-opensource-src-5.3.2.tar.xz differ: char 17, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qtdeclarative for openSUSE:Factory checked in at 2014-09-08 21:28:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtdeclarative (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtdeclarative.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtdeclarative"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtdeclarative/libqt5-qtdeclarative.changes 2014-09-02 08:22:10.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtdeclarative.new/libqt5-qtdeclarative.changes 2014-09-08 21:28:31.000000000 +0200
@@ -1,0 +2,111 @@
+Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2~git20140904 (rd8bc98b):
+ * Tip of the bugfix 5.3.2 branch
+ * Contains many bugfixes over 5.3.1 release:
+ * Doc: Added a link to the QML advanced tutorial
+ * Don't use d->instanceModel after free'ing it
+ * Fix crash with early QObject property access
+ * Fix typo in DelegateModelGroup documentation
+ * Protect some members in QQmlObjectCreator
+ * Initialize variable
+ * Don't abuse new to do a reinterpret_cast
+ * Protect incubation against its creator being deleted.
+ * Add 5.3.2 changelog for qtdeclarative
+ * Fix crash with recursively loading cached compilation units
+ * Fix typo in StateChangeScript documentation.
+ * Added the QtSQL dependency info. to the project file
+ * tst_dialogs: verify that rootObject is valid
+ * tst_dialogs: QTRY_ on the expression
+ (spyVisibilityChanged.count) not the variable.
+ * The cached objects can be deleted, so keep them in a QPointer
+ * Fix potential deadlook in threaded renderloop.
+ * Added a signal handler
+ * Fix typo in Context2D documentation.
+ * Disable threaded FBO canvas drawing when not supported.
+ * V4 JIT: fix JS stack frame size calculation.
+ * Correct strokeRect documentation.
+ * Silence harmless compiler warning.
+ * benchmarks: Skip compilation of (and mark with FIXME) a few
+ benchmarks that don't build.
+ * benchmarks/particles: fix projects to actually build
+ * Fix compilation of tst_compilation (:-P) benchmark.
+ * Avoid double deletion when deleting an incubating component.
+ * Invalidate the scenegraph properly in the rendercontrol
+ * Fix crash when loading invalid QML with behavior on
+ invalid group property
+ * Fix crash when animators are deleted just after being started
+ * Don't try to reload QQuick images when changing to
+ null screen
+ * Clarify Component.onCompleted/onDestruction docs
+ * Fix fbo creation and resize logic in QQuickWidget
+ * Fix Qt.include with cached compilation units and resources
+ * Synchronize PathView gesture grabbing with other items.
+ * Fix FBO recreated every time the QSG node is updated under
+ some conditions
+ * More QQuickCanvas cleanup handling.
+ * Make canvas cleanup work propertly...
+ * Use the current context to resolve extensions.
+ * qmlplugindumper: do not pop up a window if
+ an assert is triggered
+ * Fix assertion: ASSERT: "hasException" in file
+ jsruntime/qv4engine.cpp, line 933
+ * Fix QQmlDelegateModel getting out of sync
+ * QQuickWindow: add some links to resetOpenGLState
+ * Remove metaobject revisioning for QQuickScreenAttached
+ * Don't dereference null pointer.
+ * Flickable: Cancel interaction on interactive changes
+ * Don't try to draw shader effect sources with dims < 0.
+ * QQuickMouseArea: Mark override functions with Q_DECL_OVERRIDE
+ * Fix interaction of garbage collector with JS objects during
+ QML type instantiation
+ * Do not use mark() when marking ExecutionContexts
+ * Don't recreate header and footer unnecessarily
+ * Clear the visibleImgTags list when setting up the text layout
+ * Improve programmatic flicking of ListView (and Flickable).
+ * V4: work around a bug in libc++'s std::vector<bool>
+ * QQmlComponent::create(): visual items must have
+ a visual parent
+ * Clean up the textures when deleting the content
+ * Schedule layout changes to avoid refill() recursion.
+ * Add autotest for incorrect steal of flick.
+ * Do not crash AtlasTexture if image is null
+ * Fix Node object leak in QQuickTextEditPrivate
+ * shift and unshift fail for QQmlSequence types
+ * Check for window != 0 in QuickTestResult::grabImage().
+ * Doc: add documentation for the RSS News example
+ * Fix typo in documentation
+ * Binding Text width to implicitWidth can result in
+ incorrect layout
+ * Docs: fix "classname" indentation in the qmldir specs
+ * Fix role for generic Accessible items
+ * Calqlatr demo: Remove unused files
+ * Remove usage of external dependencies from the RSS News demo
+ * Fix crash on QQmlEngine destruction.
+ * Don't dereference null QQuickWindowPrivate.
+ * Add opt-out environment variable for @2x images
+ * Doc: correct link/compilation errors in Qt Declarative
+ * Fix crash in Flickable with pressDelay.
+ * Skip rssnews demo if xmlpatterns is not present
+ * Delete objects created by qmlplugindump
+ * Avoid double deletion of QQuickWindow
+ * Fix QQmlDelegateModel ignoring layoutChange in
+ certain situations
+ * Fix intermittent crash with older MinGW releases
+ * Doc: Add documentation for the Maroon in Trouble example
+ * Fix crash when deleting component in Component.onComplete
+ through loader
+ * Fix memory leak in QQmlComponent::createObject
+ * Update QtQuick import value to 2.3
+ * Set locked state while locking for grab.
+ * QQmlObjectCreator: Clear sharedState componentAttached
+ in destruction/clear
+ * Initialize velocity
+ * Improve RSS News Qt Quick Demo
+ * Fix QQmlComponent detailed description.
+ * Add a QQuickWidget - QQuickView comparison example
+ * Fix crash in QObjectWrapper
+- libqt5-fix-crash-with-early-QObject-property-access.patch,
+ merged upstream
+
+-------------------------------------------------------------------
Old:
----
libqt5-fix-crash-with-early-QObject-property-access.patch
qtdeclarative-opensource-src-5.3.1.tar.xz
New:
----
qtdeclarative-opensource-src-5.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtdeclarative.spec ++++++
--- /var/tmp/diff_new_pack.eWRqlc/_old 2014-09-08 21:28:33.000000000 +0200
+++ /var/tmp/diff_new_pack.eWRqlc/_new 2014-09-08 21:28:33.000000000 +0200
@@ -16,29 +16,23 @@
#
-%define qt5_snapshot 0
+%define qt5_snapshot 1
%define libname libQtQuick5
Name: libqt5-qtdeclarative
-Version: 5.3.1
+Version: 5.3.2~git20140904
Release: 0
Summary: Qt 5 Declarative 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 qtdeclarative-%{real_version}
-%else
+%define real_version 5.3.2
+%define so_version 5.3.2
%define tar_version qtdeclarative-opensource-src-%{real_version}
-%endif
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
-# PATCH-FIX-UPSTREAM libqt5-fix-crash-with-early-QObject-property-access.patch -- QTBUG-40018
-Patch1000: libqt5-fix-crash-with-early-QObject-property-access.patch
BuildRequires: fdupes
BuildRequires: libQt5Core-private-headers-devel >= %{version}
BuildRequires: libQt5Gui-private-headers-devel >= %{version}
@@ -67,12 +61,7 @@
handling.
%prep
-%if %qt5_snapshot
-%setup -q -n qtdeclarative-%{real_version}
-%else
%setup -q -n qtdeclarative-opensource-src-%{real_version}
-%endif
-%patch1000 -p1
%package -n %libname
Summary: Qt 5 Declarative Library
@@ -168,7 +157,8 @@
done
popd
-%fdupes -s %{buildroot}/%{_libqt5_includedir}
+%fdupes -s %{buildroot}%{_libqt5_includedir}
+%fdupes -s %{buildroot}%{_libqt5_examplesdir}
%files -n %libname
%defattr(-,root,root,755)
++++++ qtdeclarative-opensource-src-5.3.1.tar.xz -> qtdeclarative-opensource-src-5.3.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qtdeclarative/qtdeclarative-opensource-src-5.3.1.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtdeclarative.new/qtdeclarative-opensource-src-5.3.2.tar.xz differ: char 17, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2014-09-08 21:28:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2014-09-04 07:56:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes 2014-09-08 21:28:26.000000000 +0200
@@ -1,0 +2,242 @@
+Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2~git20140904 (r05670f5):
+ * Tip of the bugfix 5.3.2 branch:
+ * Recreate child windows when changing screens
+ * QCoreTextFontDatabase: Remove number type asserts.
+ * QGLXContext survives screen removal
+ * CoreWLan: terminate scan thread in QCoreWlanEngine destructor
+ * Also print the class name in the QObject::killTimer error msg
+ * Initialize textureId in platform backing store
+ * Doc: corrected autolink errors corelib io
+ * Avoid crash if querying device that has gone away
+ * Doc: corrected autolink errors Qjsonvalue
+ * Network: Fix NTLM (SSPI) with HTTP and HTTPS proxies
+ * remove always ask option.
+ * Fix handling QT_IM_MODULE=none
+ * xcb: use keyboard event source window to determine
+ auto-repeat valuen
+ * Fix invalid memcpy(dst, src) calls where dst == src
+ * Fix several regressions in font selection
+ * Detect wrongly labelled wheel buttons
+ * Make QWindowContainer handle drag'n'drop
+ * Resize correctly on orientation change.
+ * Use correct size in fullscreen mode
+ * Properly null-terminate ifreq::irf_name
+ * fingerpaint example: be sensitive to pressure only
+ when supported
+ * Fix a memory leak in QFseventsFileSystemWatcherEngine
+ * Do not set QMAKE_{INC,LIB}DIR_{OPENGL,X11} in the
+ freebsd mkspecs.
+ * refactor disconnectFromFtp to remove cached entries
+ when necessary
+ * Remove reference to gdb_dwarf_index from the
+ freebsd-clang mkspec.
+ * Fix mistake in function extraTryFontsForFamily
+ * Fix rendering of fonts matched based on stretch
+ * Fix x86/32-bit build when using an old version of gcc
+ * Fix selection of fonts based on styleName
+ * QFusionStyle paints sliders outside of clip
+ * Set iMX device specific compiler flags to QMAKE_CFLAGS
+ * Fix QPainter::drawPolyline() painting errors with
+ cosmetic pen
+ * Let QImage::mirrored() retain dots-per-meter settings
+ * Make sure we don't cache old file sizes prior to new writes
+ * Correct the SYNC hint for the release barrier
+ * Fix QT_NO_REGULAREXPRESSION build
+ * Fix QT_NO_ANIMATION build
+ * Fix build with QT_NO_MDIAREA
+ * Show the correct cursor for QLineEdit's side buttons.
+ * Fix disconnect()ing from signals declared in a base class
+ * Fix rendering alpha-blended text which needs to be
+ clipped at the top.
+ * Fix build due to missing include when using a minimal config.
+ * Fix build with QT_NO_DRAGANDDROP
+ * Font Database: Add support for private, system UI
+ font families
+ * Apply upstream patch r1498 to our PCRE copy
+ * Apply upstream patch r1495 to our PCRE copy
+ * Initialize member.
+ * Document missing QLatin1String methods
+ * network tests: add manual test for auth / proxy auth
+ * Uncomment some tests which accidently got commented
+ * Both HiQualAA and normal AA should mean
+ antialiasing in rasterengine.
+ * Check if Start/EndPage returns non-positive value
+ when error checking
+ * GTK file dialog: pre-fill the filename if given to a
+ Save dialog
+ * QFileDialog docs: remove misleading sentence about
+ static functions
+ * Doc: Placed Qt OpenGL class convention in code block.
+ * Undo: Fix state entry bug for parallel state groups
+ * Do not add QOffscreenSurface windows to the global list
+ * tst_QHash: check which of several equal keys is inserted
+ * OpenGL: destroy QGLContext allocated by
+ QGLContext::fromOpenGLContext
+ * tst_QSet: check which of several equal elements is inserted
+ * fix paths in installed qtmain.prl
+ * add /ENTRY:main only for target builds
+ * avoid that CROSS_COMPILE affects host builds
+ * Add missing power button keycode to keymap
+ * Android: export ANDROID_SDK_BUILD_TOOLS_REVISION.
+ * cocoa: Fix compiler warnings about unused functions.
+ * Propagate swapInterval to QGLFormat
+ * Fix double clicks in eglfs
+ * Work around ICC bug in local static symbols for
+ Q_GLOBAL_STATIC
+ * QCoreTextFontDatabase: Fix font weight value when
+ populating a family
+ * Don't convert signed to unsigned when we need all 32bit
+ * Fix compilation if EC is disabled in OpenSSL
+ * Fix warning message when re-setting text on tooltip
+ * Improve dbus cross compilation
+ * Fix buffer overrun error with some proxy servers
+ * QNAM: Fix CPU load for limited upload QIODevice
+ * qmake: Document the "aux" template type.
+ * Use the stateless UTF-8 encoder in QStringRef::toUtf8
+ * Doc: corrected autolink errors in qnamespace.qdoc
+ * QPixmap::fromImage() should detach when changing
+ QImage format
+ * generate QGL header file from qgl.h
+ * Ensure transient parents are top level widgets.
+ * Added stream version into network cache file format
+ * make QtWidgets claim style plugins
+ * CMake: Don't check the existence of GL files in the
+ Qt5Gui package.
+ * QSplitter: Exclude top level widgets from child
+ event handling.
+ * Doc: Hide QTextInlineObject constructor from
+ the documentation
+ * Work around ICC bug in brace initializations
+ containing constexpr
+ * Doc: edited qtxml.qdocconf
+ * xcb: QTabletEvents and proximity events correctly
+ identify the tool
+ * Fixed wrong function name in a file snippet
+ * XCB: Enable loading of the Qt::DragLinkCursor
+ * Fix fallbacks for adapted common script
+ * Fix fallbacks for adapted common script
+ * QSslCertificate: blacklist NIC certificates from India
+ * Doc: moved saxbookmarks example files
+ * tst_qdir: Move QFINDTESTDATA() from init() to constructor.
+ * Doc: moved streambookmarks example files
+ * Don't assert when HB-old is unable to deal with surrogates
+ * REG: Fix nbsp in QTextLayout
+ * Support getting test data from qrc
+ * Document QApplication::cursorFlashTime() can return -1
+ * Fix for code snippet in commandlineparser documentation
+ * Doc: removed trolltech.com from namespace in manual
+ qdocconf file.
+ * Fix typo in QGraphicsView documentation.
+ * Fix QTimer with negative interval in
+ QWidgetLineControl::setCursorBlinkPeriod
+ * Attempt to work with Visual Studio in -Za (strict ANSI) mode
+ * Improve QListWidget documentation.
+ * Fix debug output of QTouchEvent.
+ * Doc: fix a link in QAbstractOpenGLFunctions documentation
+ * Accessibility Linux: Fix crashes when accessing
+ invalid functions
+ * move loading of testability driver from QApplication
+ to QGuiApplication
+ * QPdf::addImage(): avoid a QImage detach when it's in an
+ acceptable Format
+ * Make QDom/QXmlSimpleReader reentrant.
+ * Move QXmlReaderPrivate to private header.
+ * Mac: Don't register for Pan Gestures.
+ * Add opt-out environment variable for @2x images
+ * Listen to touch events on the master device instead of slave.
+ * add support for device linux-arm-hisilicon-hix5hd2-g++
+ * Make tst_QLocale::macDefaultLocale() more robust
+ * Fix some tst_qwidget test cases
+ * xcb: make sure to update window title when it is changed
+ * Skip unstable autotests in QtBase.
+ * Empty icons and Cocoa menu items.
+ * Address Book example: Fix QTableView column sorting
+ * QOpenGLTexture: fix the feature test for Buffer Textures
+ * qDebug: fix data race in qt_message_print
+ * [bcm97425] Fix parameter issue in platformDestroy hook
+ * Doc: Various \note fixes in Qt namespace documentation.
+ * Fix QFileInfoGatherer threading issue
+ * Doc: Fix typo in QScopedValueRollback
+ * Fix pixel noise in X11 systray icons that are not 22x22
+ * Don't compare the target methods for SlotObject connections
+ * qtoolbar: add missing header on OSX.
+ * Remove bogus nullptr check for reference
+ * Support MIPS atomic on pre-MIPS32 architectures
+ * Enable sparc detection.
+ * Remove -Wcast-align from QMAKE_CXXFLAGS.
+ * Create the 64 bits version strings for MIPS, SPARC and S390
+ * Add a comment stating QMutex::isRecursive should be made
+ const in Qt6
+ * Fix QMutex documentation saying some function are static
+ while they are not
+ * Delete qml_plugin_import.cpp file only during distclean
+ * WinRT: no read-only paths in QStandardpaths::writableLocation
+ * Fix compilation on Windows without precompiled headers
+ * QColorDialog: Do not update custom/standard color cells
+ while picking.
+ * Fix -Werror compilation on big-endian
+ * CMake: Allow modules to specify the location of tests.
+ * Mark behavior of QFileInfo::absoluteFilePath as undefined in
+ corner cases
+ * Translate Super/Hyper keys to MetaModifier
+ * Fix logging file location docs
+ * CMake: Report an error if unit tests are not found for
+ a module.
+ * Fix QRingBuffer::readPointerAtPosition()
+ * Make the fetchAndAddRelaxed function a member template
+ * Doc: qInstallMessageHandler cannot return 0.
+ * GIF decoding: do not seek() if the image is loaded
+ over the network
+ * network internals: do not try to cache a deleted entry
+ * Fix memory leaks in QFseventsFileSystemWatcherEngine
+ * Simplify mirroring code and add tests for non-aliged
+ 1 bit images
+ * Add that the corner settings are saved/restored
+ with the state
++++ 45 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes
++++ and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes
Old:
----
0001-Do-not-overwrite-existing-event-mask-of-root-window.patch
0002-Properly-check-which-OpenGL-features-are-supported.patch
0003-Fix-data-race-on-QLoggingCategory-when-using-qDebug-.patch
0004-QDBus-fix-data-race-on-isDebugging-bool.patch
0005-Translate-Super-Hyper-keys-to-MetaModifier.patch
libqt5-avoid-crash-during-querying-device.patch
libqt5-fix-leak-with-touch-devices-in-xcb.patch
libqt5-listen-to-touch-events-on-the-master-device.patch
qtbase-opensource-src-5.3.1.tar.xz
New:
----
protect-geometry-QTBUG-40584.patch
qtbase-opensource-src-5.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtbase.spec ++++++
--- /var/tmp/diff_new_pack.UNFmqT/_old 2014-09-08 21:28:31.000000000 +0200
+++ /var/tmp/diff_new_pack.UNFmqT/_new 2014-09-08 21:28:31.000000000 +0200
@@ -16,65 +16,48 @@
#
-%define qt5_snapshot 0
+%define qt5_snapshot 1
%define journald 0
Name: libqt5-qtbase
-Version: 5.3.1
+Version: 5.3.2~git20140904
Release: 0
Summary: C++ Program Library, Core Components
License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1
Group: System/Libraries
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 qtbase-%{real_version}
-%else
+%define real_version 5.3.2
+%define so_version 5.3.2
%define tar_version qtbase-opensource-src-%{real_version}
-%endif
Source: %{tar_version}.tar.xz
# to get mtime of file:
Source1: libqt5-qtbase.changes
Source2: macros.qt5
Source3: baselibs.conf
+# patches 0-1000 are openSUSE and/or non-upstream(able) patches #
# PATCH-FIX-UPSTREAM libqt5-libtool-nodate.diff -- for ommiting date/time on build
-Patch109: libqt5-libtool-nodate.diff
+Patch0: libqt5-libtool-nodate.diff
# PATCH-FIX-UPSTREAM qmake-add-usr-include.diff -- explicitly include /usr/include path
-Patch131: qmake-add-usr-include.diff
+Patch1: qmake-add-usr-include.diff
# PATCH-FIX-UPSTREAM use-freetype-default.patch -- allow using lcd-default filter regardless of how freetype2 library has been built (w/ & w/o subpixel)
-Patch132: use-freetype-default.patch
+Patch2: use-freetype-default.patch
+# PATCH-FIX-SUSE libqt5-Fix-Gujarati-font.patch bnc#878292 fix broken Gujarati font rendering
+Patch3: libqt5-Fix-Gujarati-font.patch
+# PATCH-FIX-UPSTREAM protect-geometry-QTBUG-40584.patch -- https://bugreports.qt-project.org/browse/QTBUG-40584
+Patch4: protect-geometry-QTBUG-40584.patch
+# patches 1000-2000 and above from upstream 5.3 branch #
+# patches 2000-3000 and above from upstream 5.4 branch #
# PATCH-FIX-UPSTREAM f1ee10f81ac18789e9a7dc715b464415ba2bc2b8.patch -- prefer QPA implementation in qsystemtrayicon_x11 if available
-Patch133: f1ee10f81ac18789e9a7dc715b464415ba2bc2b8.patch
+Patch2000: f1ee10f81ac18789e9a7dc715b464415ba2bc2b8.patch
# PATCH-FIX-UPSTREAM libqt5-add-support-for-byte-swapping.patch -- add support for byte swapping(bnc#866709), currently it's at the upstream dev branch
-Patch134: libqt5-add-support-for-byte-swapping.patch
+Patch2001: libqt5-add-support-for-byte-swapping.patch
# PATCH-FIX-UPSTREAM libqt5-byte-order-byte-is-address0.patch -- the byte order byte is at address 0(bnc#866709), currently it's at the upstream dev branch
-Patch135: libqt5-byte-order-byte-is-address0.patch
-# PATCH-FIX-SUSE libqt5-Fix-Gujarati-font.patch bnc#878292 fix broken Gujarati font rendering
-Patch136: libqt5-Fix-Gujarati-font.patch
-
-# patches 1000 and above from upstream 5.3 branch #
-# PATCH-FIX-UPSTREAM 0001-Do-not-overwrite-existing-event-mask-of-root-window.patch -- QTBUG-39648
-Patch1000: 0001-Do-not-overwrite-existing-event-mask-of-root-window.patch
-# PATCH-FIX-UPSTREAM 0002-Properly-check-which-OpenGL-features-are-supported.patch -- QTBUG-39730
-Patch1001: 0002-Properly-check-which-OpenGL-features-are-supported.patch
-# PATCH-FIX-UPSTREAM 0003-Fix-data-race-on-QLoggingCategory-when-using-qDebug-.patch -- Fix data race on QLoggingCategory
-Patch1002: 0003-Fix-data-race-on-QLoggingCategory-when-using-qDebug-.patch
-# PATCH-FIX-UPSTREAM 0004-QDBus-fix-data-race-on-isDebugging-bool.patch -- fix data race on isDebugging bool
-Patch1003: 0004-QDBus-fix-data-race-on-isDebugging-bool.patch
-# PATCH-FIX-UPSTREAM 0005-Translate-Super-Hyper-keys-to-MetaModifier.patch -- QTBUG-38428
-Patch1004: 0005-Translate-Super-Hyper-keys-to-MetaModifier.patch
+Patch2002: libqt5-byte-order-byte-is-address0.patch
# PATCH-FIX-UPSTREAM 00010-Replace-the-const-QString-global-static-with-a-QStri.patch
-Patch2000: 00010-Replace-the-const-QString-global-static-with-a-QStri.patch
+Patch2003: 00010-Replace-the-const-QString-global-static-with-a-QStri.patch
# PATCH-FIX-UPSTREAM 00011-Use-correct-signal-name-when-disconnecting.patch
-Patch2001: 00011-Use-correct-signal-name-when-disconnecting.patch
-# PATCH-FIX-UPSTREAM libqt5-fix-leak-with-touch-devices-in-xcb.patch -- QTBUG-39596
-Patch2002: libqt5-fix-leak-with-touch-devices-in-xcb.patch
-# PATCH-FIX-UPSTREAM libqt5-listen-to-touch-events-on-the-master-device.patch -- QTBUG-38625
-Patch2003: libqt5-listen-to-touch-events-on-the-master-device.patch
-# PATCH-FIX-UPSTREAM libqt5-avoid-crash-during-querying-device.patch -- QTBUG-40820
-Patch2004: libqt5-avoid-crash-during-querying-device.patch
+Patch2004: 00011-Use-correct-signal-name-when-disconnecting.patch
BuildRequires: alsa-devel
BuildRequires: cups-devel
BuildRequires: fdupes
@@ -152,23 +135,12 @@
%define libqt5_translationdir %{libqt5_datadir}/translations
%prep
-%if %qt5_snapshot
-%setup -q -n qtbase-%{real_version}
-%else
%setup -q -n qtbase-opensource-src-%{real_version}
-%endif
-%patch109 -p1
-%patch131 -p1
-%patch132 -p1
-%patch133 -p1
-%patch134 -p1
-%patch135 -p1
-%patch136 -p1
-%patch1000 -p1
-%patch1001 -p1
-%patch1002 -p1
-%patch1003 -p1
-%patch1004 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%patch2000 -p1
%patch2001 -p1
%patch2002 -p1
++++++ protect-geometry-QTBUG-40584.patch ++++++
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
index 35a526e..d417e41 100644
--- a/src/widgets/kernel/qwidgetwindow.cpp
+++ b/src/widgets/kernel/qwidgetwindow.cpp
@@ -551,6 +551,13 @@ void QWidgetWindow::updateGeometry()
const QMargins margins = frameMargins();
+ if (geometry().x() != m_widget->data->crect.x() ||
+ geometry().y() != m_widget->data->crect.y())
+ m_widget->setAttribute(Qt::WA_Moved);
+ if (geometry().width() != m_widget->data->crect.width() ||
+ geometry().height() != m_widget->data->crect.height())
+ m_widget->setAttribute(Qt::WA_Resized);
+
m_widget->data->crect = geometry();
QTLWExtra *te = m_widget->d_func()->topData();
te->posIncludesFrame= false;
++++++ qtbase-opensource-src-5.3.1.tar.xz -> qtbase-opensource-src-5.3.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qtbase/qtbase-opensource-src-5.3.1.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/qtbase-opensource-src-5.3.2.tar.xz differ: char 17, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package vim for openSUSE:Factory checked in at 2014-09-08 21:28:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vim (Old)
and /work/SRC/openSUSE:Factory/.vim.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vim"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vim/vim.changes 2014-08-30 16:04:38.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vim.new/vim.changes 2014-09-08 21:28:24.000000000 +0200
@@ -1,0 +2,19 @@
+Sat Aug 30 14:21:44 UTC 2014 - idonmez(a)suse.com
+
+- Updated to revision 429, fixes the following problems
+ * When leaving ":append" the cursor shape is like in Insert mode.
+ (Jacob Niehus)
+ * When part of a list is locked it's possible to make changes.
+ * Crash when searching for "\ze*". (Urtica Dioica)
+ * When using conceal with linebreak some text is not displayed
+ correctly. (Grüner Gimpel)
+ * expand("$shell") does not work as documented.
+ * Get ml_get error when using Python to delete lines in a buffer
+ that is not in a window. issue 248.
+ * When 'showbreak' is used "gj" may move to the wrong position.
+ (Nazri Ramliy)
+ * When an InsertCharPre autocommand executes system() typeahead may
+ be echoed and messes up the display. (Jacob Niehus)
+ * Build fails with fewer features. (Elimar Riesebieter)
+
+-------------------------------------------------------------------
Old:
----
vim-7.4.417.hg.6162.tar.xz
New:
----
vim-7.4.429.hg.6187.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vim.spec ++++++
--- /var/tmp/diff_new_pack.0mF5QY/_old 2014-09-08 21:28:25.000000000 +0200
+++ /var/tmp/diff_new_pack.0mF5QY/_new 2014-09-08 21:28:25.000000000 +0200
@@ -17,8 +17,8 @@
%define pkg_version 7.4
-%define patchlevel 417
-%define revision 6162
+%define patchlevel 429
+%define revision 6187
%define VIM_SUBDIR vim74
%define site_runtimepath /usr/share/vim/site
%define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?_smp_mflags}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.0mF5QY/_old 2014-09-08 21:28:26.000000000 +0200
+++ /var/tmp/diff_new_pack.0mF5QY/_new 2014-09-08 21:28:26.000000000 +0200
@@ -3,8 +3,8 @@
<param name="scm">hg</param>
<param name="url">https://code.google.com/p/vim/</param>
<param name="filename">vim</param>
- <param name="versionprefix">7.4.417.hg</param>
- <param name="revision">v7-4-417</param>
+ <param name="versionprefix">7.4.429.hg</param>
+ <param name="revision">v7-4-429</param>
</service>
<service name="recompress" mode="disabled">
<param name="compression">xz</param>
++++++ vim-7.4.417.hg.6162.tar.xz -> vim-7.4.429.hg.6187.tar.xz ++++++
/work/SRC/openSUSE:Factory/vim/vim-7.4.417.hg.6162.tar.xz /work/SRC/openSUSE:Factory/.vim.new/vim-7.4.429.hg.6187.tar.xz differ: char 27, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package sbl for openSUSE:Factory checked in at 2014-09-08 21:28:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sbl (Old)
and /work/SRC/openSUSE:Factory/.sbl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sbl/sbl.changes 2014-08-15 09:55:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sbl.new/sbl.changes 2014-09-08 21:28:22.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Sep 5 14:46:52 CEST 2014 - ro(a)suse.de
+
+- add systemd support (bnc#865857)
+
+-------------------------------------------------------------------
New:
----
brld.service
sbl.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sbl.spec ++++++
--- /var/tmp/diff_new_pack.qZrSWN/_old 2014-09-08 21:28:23.000000000 +0200
+++ /var/tmp/diff_new_pack.qZrSWN/_new 2014-09-08 21:28:23.000000000 +0200
@@ -22,9 +22,15 @@
BuildRequires: libusb-devel
BuildRequires: orca
BuildRequires: speechd-devel
+%if %{suse_version} > 1310
+BuildRequires: pkgconfig(libsystemd-daemon)
+%{?systemd_requires}
+%endif
Version: 3.5.0
Release: 0
Source: sbl-3.5.0.tbz2
+Source1: sbl.service
+Source2: brld.service
Patch1: sbl-shared.patch
Patch2: sbl-nostrip.patch
Summary: SUSE blinux
@@ -72,18 +78,48 @@
%install
make LIBINSTPATH=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install
+%if %{suse_version} > 1310
+rm -f $RPM_BUILD_ROOT/etc/init.d/sbl
+rm -f $RPM_BUILD_ROOT/etc/init.d/brld
+install -D -m 644 %SOURCE1 %{buildroot}%{_unitdir}/sbl.service
+install -D -m 644 %SOURCE2 %{buildroot}%{_unitdir}/brld.service
+rm -f $RPM_BUILD_ROOT/usr/sbin/rcsbl
+rm -f $RPM_BUILD_ROOT/usr/sbin/rcbrld
+ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcsbl
+ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcbrld
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
+%if %{suse_version} > 1310
+%pre
+%service_add_pre sbl.service
+%service_add_pre brld.service
+
+%preun
+%service_del_preun brld.service
+%service_del_preun sbl.service
+%endif
+
%post
/sbin/ldconfig
+%if %{suse_version} > 1310
+%service_add_post sbl.service
+%service_add_post brld.service
+%else
%{insserv_force_if_yast etc/init.d/sbl }
%{insserv_force_if_yast etc/init.d/brld }
+%endif
%postun
/sbin/ldconfig
+%if %{suse_version} > 1310
+%service_del_postun brld.service
+%service_del_postun sbl.service
+%else
%{insserv_cleanup}
+%endif
%files
%defattr (-,root,root,755)
@@ -102,8 +138,13 @@
/usr/sbin/brld
/usr/sbin/rcbrld
%{_libdir}/libbrld.so.1
+%if %{suse_version} > 1310
+%{_unitdir}/sbl.service
+%{_unitdir}/brld.service
+%else
/etc/init.d/sbl
/etc/init.d/brld
+%endif
/usr/share/man/man8/brld.8.gz
/usr/share/man/man8/sbl.8.gz
++++++ brld.service ++++++
[Unit]
Description=Braille Server
Wants=network.target
After=network.target
[Service]
ExecStart=/usr/sbin/brld
[Install]
WantedBy=multi-user.target
++++++ sbl.service ++++++
[Unit]
Description=suse-blinux
Wants=network.target brld.service
After=network.target brld.service
[Service]
ExecStart=/usr/sbin/sbl
[Install]
WantedBy=multi-user.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package ca-certificates-mozilla for openSUSE:Factory checked in at 2014-09-08 21:28:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ca-certificates-mozilla (Old)
and /work/SRC/openSUSE:Factory/.ca-certificates-mozilla.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ca-certificates-mozilla"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ca-certificates-mozilla/ca-certificates-mozilla.changes 2014-08-30 18:55:50.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ca-certificates-mozilla.new/ca-certificates-mozilla.changes 2014-09-08 21:28:21.000000000 +0200
@@ -2,31 +1,0 @@
-Tue Aug 26 13:30:12 UTC 2014 - meissner(a)suse.com
-
-- Updated to 2.1 (bnc#888534)
-
-- The following 1024-bit CA certificates were removed
- - Entrust.net Secure Server Certification Authority
- - ValiCert Class 1 Policy Validation Authority
- - ValiCert Class 2 Policy Validation Authority
- - ValiCert Class 3 Policy Validation Authority
- - TDC Internet Root CA
-- The following CA certificates were added:
- - Certification Authority of WoSign
- - CA 沃通根证书
- - DigiCert Assured ID Root G2
- - DigiCert Assured ID Root G3
- - DigiCert Global Root G2
- - DigiCert Global Root G3
- - DigiCert Trusted Root G4
- - QuoVadis Root CA 1 G3
- - QuoVadis Root CA 2 G3
- - QuoVadis Root CA 3 G3
-- The Trust Bits were changed for the following CA certificates
- - Class 3 Public Primary Certification Authority
- - Class 3 Public Primary Certification Authority
- - Class 2 Public Primary Certification Authority - G2
- - VeriSign Class 2 Public Primary Certification Authority - G3
- - AC Raíz Certicámara S.A.
- - NetLock Uzleti (Class B) Tanusitvanykiado
- - NetLock Expressz (Class C) Tanusitvanykiado
-
--------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ca-certificates-mozilla.spec ++++++
--- /var/tmp/diff_new_pack.ifMzTp/_old 2014-09-08 21:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.ifMzTp/_new 2014-09-08 21:28:22.000000000 +0200
@@ -26,7 +26,7 @@
Name: ca-certificates-mozilla
# Version number is NSS_BUILTINS_LIBRARY_VERSION in this file:
# https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/n…
-Version: 2.1
+Version: 1.97
Release: 0
Summary: CA certificates for OpenSSL
License: MPL-2.0
++++++ certdata.txt ++++++
++++ 2788 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/ca-certificates-mozilla/certdata.txt
++++ and /work/SRC/openSUSE:Factory/.ca-certificates-mozilla.new/certdata.txt
++++++ nssckbi.h ++++++
--- /var/tmp/diff_new_pack.ifMzTp/_old 2014-09-08 21:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.ifMzTp/_new 2014-09-08 21:28:22.000000000 +0200
@@ -44,9 +44,9 @@
* whether we may use its full range (0-255) or only 0-99 because
* of the comment in the CK_VERSION type definition.
*/
-#define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 2
-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 1
-#define NSS_BUILTINS_LIBRARY_VERSION "2.1"
+#define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 97
+#define NSS_BUILTINS_LIBRARY_VERSION "1.97"
/* These version numbers detail the semantic changes to the ckfw engine. */
#define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at 2014-09-08 21:28:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old)
and /work/SRC/openSUSE:Factory/.btrfsprogs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "btrfsprogs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2014-07-13 14:06:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.btrfsprogs.new/btrfsprogs.changes 2014-09-08 21:28:19.000000000 +0200
@@ -1,0 +2,55 @@
+Fri Sep 5 15:02:39 CEST 2014 - dsterba(a)suse.cz
+
+- send-stream API users updatd, drop the workaround
+- Removed patch: send-stream-api-wokaround.patch
+
+-------------------------------------------------------------------
+Mon Sep 1 14:07:53 CEST 2014 - dsterba(a)suse.cz
+
+- workaround for send api breakage
+- Added patch: send-stream-api-wokaround.patch
+
+-------------------------------------------------------------------
+Wed Aug 27 17:23:48 CEST 2014 - dsterba(a)suse.cz
+
+- add api versioning and package version.h (now 0.1.1)
+- Added patches:
+ * library-version-defines.patch
+
+-------------------------------------------------------------------
+Tue Aug 26 20:13:21 CEST 2014 - dsterba(a)suse.cz
+
+- version 3.16
+ - show-super: skip unrecognized sb, add option to force
+ - debug-tree: print tree by id
+ - mkfs: new option to specify UUID
+ - receive: new option to limit number of errors
+ - check: new option to verify quotas
+ - check: reduced memory requirements
+ - check: new option to print extent sharing
+ - restore: check length before decompression
+ - restore: more error handling
+ - balance: new filter 'limit'
+ - recover: allow to read all sb copies
+ - restore: option to loop during restoring
+ - mkfs: drop experimental notice
+ - btrfstune: new option to force dangerous changes
+ - documentation updates
+
+- Deleted patches (upstream):
+ * 0001-btrfs-progs-doc-fix-symlink-target-for-btrfsck.8.patch
+ * 0200-btrfs-progs-print-qgroup-excl-as-unsigned.patch
+ * 0201-btrfs-progs-import-ulist.patch
+ * 0202-btrfs-progs-add-quota-group-verify-code.patch
+ * 0203-btrfs-progs-show-extent-state-for-a-subvolume.patch
+ * 0204-btrfs-progs-ignore-orphaned-qgroups-by-default.patch
+ * btrfs-progs-canonicalize-pathnames-for-device-commands
+- Refreshed patches:
+ * 0006-Btrfs-progs-fsck-clear-out-log-tree-in-repair-mode.patch
+ * 0011-btrfs-progs-Enhance-the-command-btrfs-filesystem-df.patch
+ * 0012-btrfs-progs-Add-helpers-functions-to-handle-the-prin.patch
+ * 0013-btrfs-progs-Add-command-btrfs-filesystem-disk-usage.patch
+ * 0028-btrfs-progs-extend-pretty-printers-with-unit-mode.patch
+ * 0164-btrfs-progs-convert-set-label-or-copy-from-origin.patch
+
+-------------------------------------------------------------------
Old:
----
0001-btrfs-progs-doc-fix-symlink-target-for-btrfsck.8.patch
0200-btrfs-progs-print-qgroup-excl-as-unsigned.patch
0201-btrfs-progs-import-ulist.patch
0202-btrfs-progs-add-quota-group-verify-code.patch
0203-btrfs-progs-show-extent-state-for-a-subvolume.patch
0204-btrfs-progs-ignore-orphaned-qgroups-by-default.patch
btrfs-progs-canonicalize-pathnames-for-device-commands
btrfs-progs-v3.14.2.tar.bz2
New:
----
btrfs-progs-v3.16.tar.gz
library-version-defines.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ btrfsprogs.spec ++++++
--- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200
+++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200
@@ -16,9 +16,9 @@
#
-%define tar_version v3.14.2
+%define tar_version v3.16
Name: btrfsprogs
-Version: 3.14.2
+Version: 3.16
Release: 0
Summary: Utilities for the Btrfs filesystem
License: GPL-2.0
@@ -26,12 +26,10 @@
Url: http://btrfs.wiki.kernel.org/index.php/Main_Page
#Git-Web: http://git.kernel.org/cgit/linux/kernel/git/mason/btrfs-progs.git
#Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs
-# git archive --format=tar --prefix=btrfs-progs-`git describe --tags --match "v*"`/ HEAD > %D/btrfs-progs-`git describe --tags --match "v*"`.tar
-Source: btrfs-progs-%{tar_version}.tar.bz2
+Source: https://www.kernel.org/pub/linux/kernel/people/mason/btrfs-progs/btrfs-prog…
Source1: boot-btrfs.sh
Source4: setup-btrfs.sh
-Patch1: 0001-btrfs-progs-doc-fix-symlink-target-for-btrfsck.8.patch
Patch6: 0006-Btrfs-progs-fsck-clear-out-log-tree-in-repair-mode.patch
Patch7: 0007-Btrfs-progs-fsck-avoid-pinning-same-block-several-ti.patch
Patch8: 0008-Btrfs-progs-fsck-add-ability-to-check-reloc-roots.patch
@@ -63,15 +61,10 @@
Patch168: 0168-Btrfs-progs-don-t-bug-out-if-we-can-t-find-the-last-.patch
Patch169: 0169-btrfs-progs-Check-metadata-mirrors-in-find-root.patch
Patch171: 0171-btrfs-progs-make-free-space-checker-work-on-non-4k-s.patch
-Patch172: btrfs-progs-canonicalize-pathnames-for-device-commands
-
-Patch200: 0200-btrfs-progs-print-qgroup-excl-as-unsigned.patch
-Patch201: 0201-btrfs-progs-import-ulist.patch
-Patch202: 0202-btrfs-progs-add-quota-group-verify-code.patch
-Patch203: 0203-btrfs-progs-show-extent-state-for-a-subvolume.patch
-Patch204: 0204-btrfs-progs-ignore-orphaned-qgroups-by-default.patch
Patch1000: local-version-override.patch
+Patch1001: library-version-defines.patch
+
BuildRequires: asciidoc
BuildRequires: libacl-devel
BuildRequires: libattr-devel
@@ -108,7 +101,6 @@
%prep
%setup -q -n btrfs-progs-%{tar_version}
-%patch1 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
@@ -139,13 +131,8 @@
%patch168 -p1
%patch169 -p1
%patch171 -p1
-%patch172 -p1
-%patch200 -p1
-%patch201 -p1
-%patch202 -p1
-%patch203 -p1
-%patch204 -p1
%patch1000 -p1
+%patch1001 -p1
%build
make %{?_smp_mflags} CFLAGS="%{optflags}" all btrfs-convert \
@@ -157,13 +144,12 @@
install -m 0755 -d %{buildroot}/%{_bindir}
# move some utilities out of /usr/sbin
mv %{buildroot}/%{_sbindir}/btrfs-map-logical %{buildroot}/%{_bindir}
-# mkinitrd rescue utilities
+# initrd rescue utilities
install -m 0755 btrfs-zero-log %{buildroot}/%{_sbindir}
install -m 0755 btrfs-select-super %{buildroot}/%{_sbindir}
install -m 0755 btrfs-image %{buildroot}/%{_sbindir}
install -m 0755 btrfstune %{buildroot}/%{_sbindir}
install -m 0755 btrfs-find-root %{buildroot}/%{_sbindir}
-#UsrMerge
install -m 0755 -d %{buildroot}/sbin
ln -s %{_sbindir}/btrfs %{buildroot}/sbin
ln -s %{_sbindir}/btrfs-zero-log %{buildroot}/sbin
@@ -177,9 +163,6 @@
ln -s %{_sbindir}/btrfs-show-super %{buildroot}/sbin
ln -s %{_sbindir}/mkfs.btrfs %{buildroot}/sbin
ln -s %{_sbindir}/fsck.btrfs %{buildroot}/sbin
-#EndUsrMerge
-#UsrMerge
-#EndUsrMerge
install -d -m0755 %{buildroot}/lib/mkinitrd/scripts/
install -m 0755 %{SOURCE1} %{buildroot}/lib/mkinitrd/scripts/
install -m 0755 %{SOURCE4} %{buildroot}/lib/mkinitrd/scripts/
@@ -206,7 +189,6 @@
%defattr(-, root, root)
/sbin/fsck.btrfs
# mkinitrd utils
-#UsrMerge
/sbin/btrfs
/sbin/btrfs-zero-log
/sbin/btrfs-convert
@@ -216,7 +198,6 @@
/sbin/mkfs.btrfs
/sbin/btrfs-debug-tree
/sbin/btrfs-show-super
-#EndUsrMerge
%{_sbindir}/btrfs
%{_sbindir}/btrfs-zero-log
%{_sbindir}/btrfs-convert
@@ -231,13 +212,13 @@
%dir /lib/mkinitrd/scripts
/lib/mkinitrd/scripts/boot-btrfs.sh
/lib/mkinitrd/scripts/setup-btrfs.sh
-# other
%{_bindir}/btrfs-map-logical
%{_mandir}/man8/btrfs-image.8.gz
%{_mandir}/man8/btrfsck.8.gz
%{_mandir}/man8/fsck.btrfs.8.gz
%{_mandir}/man8/mkfs.btrfs.8.gz
%{_mandir}/man8/btrfs.8.gz
+%{_mandir}/man5/btrfs.5.gz
%{_mandir}/man8/btrfs-convert.8.gz
%{_mandir}/man8/btrfs-debug-tree.8.gz
%{_mandir}/man8/btrfs-map-logical.8.gz
++++++ 0006-Btrfs-progs-fsck-clear-out-log-tree-in-repair-mode.patch ++++++
--- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200
+++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200
@@ -15,11 +15,11 @@
cmds-check.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
-diff --git a/cmds-check.c b/cmds-check.c
-index 1fe97b3a38c0..7457618fb702 100644
---- a/cmds-check.c
-+++ b/cmds-check.c
-@@ -6616,6 +6616,22 @@ out:
+Index: btrfs-progs-v3.16/cmds-check.c
+===================================================================
+--- btrfs-progs-v3.16.orig/cmds-check.c
++++ btrfs-progs-v3.16/cmds-check.c
+@@ -6538,6 +6538,22 @@ out:
return ret;
}
@@ -42,7 +42,7 @@
static struct option long_options[] = {
{ "super", 1, NULL, 's' },
{ "repair", 0, NULL, 0 },
-@@ -6720,6 +6736,23 @@ int cmd_check(int argc, char **argv)
+@@ -6657,6 +6673,23 @@ int cmd_check(int argc, char **argv)
}
root = info->fs_root;
@@ -64,8 +64,5 @@
+ }
+
uuid_unparse(info->super_copy->fsid, uuidbuf);
- printf("Checking filesystem on %s\nUUID: %s\n", argv[optind], uuidbuf);
-
---
-1.9.0
-
+ if (qgroup_report) {
+ printf("Print quota groups for %s\nUUID: %s\n", argv[optind],
++++++ 0011-btrfs-progs-Enhance-the-command-btrfs-filesystem-df.patch ++++++
--- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200
+++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200
@@ -21,11 +21,11 @@
create mode 100644 cmds-fi-disk_usage.c
create mode 100644 cmds-fi-disk_usage.h
-diff --git a/Makefile b/Makefile
-index 76565e8b2307..50fb9b0ff2e3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -15,7 +15,7 @@ cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \
+Index: btrfs-progs-v3.16/Makefile
+===================================================================
+--- btrfs-progs-v3.16.orig/Makefile
++++ btrfs-progs-v3.16/Makefile
+@@ -15,7 +15,7 @@ cmds_objects = cmds-subvolume.o cmds-fil
cmds-inspect.o cmds-balance.o cmds-send.o cmds-receive.o \
cmds-quota.o cmds-qgroup.o cmds-replace.o cmds-check.o \
cmds-restore.o cmds-rescue.o chunk-recover.o super-recover.o \
@@ -34,11 +34,10 @@
libbtrfs_objects = send-stream.o send-utils.o rbtree.o btrfs-list.o crc32c.o \
uuid-tree.o utils-lib.o
libbtrfs_headers = send-stream.h send-utils.h send.h rbtree.h btrfs-list.h \
-diff --git a/cmds-fi-disk_usage.c b/cmds-fi-disk_usage.c
-new file mode 100644
-index 000000000000..4012c781f20d
+Index: btrfs-progs-v3.16/cmds-fi-disk_usage.c
+===================================================================
--- /dev/null
-+++ b/cmds-fi-disk_usage.c
++++ btrfs-progs-v3.16/cmds-fi-disk_usage.c
@@ -0,0 +1,516 @@
+/*
+ * This program is free software; you can redistribute it and/or
@@ -556,11 +555,10 @@
+ return 0;
+}
+
-diff --git a/cmds-fi-disk_usage.h b/cmds-fi-disk_usage.h
-new file mode 100644
-index 000000000000..9f68bb342d52
+Index: btrfs-progs-v3.16/cmds-fi-disk_usage.h
+===================================================================
--- /dev/null
-+++ b/cmds-fi-disk_usage.h
++++ btrfs-progs-v3.16/cmds-fi-disk_usage.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2007 Oracle. All rights reserved.
@@ -587,10 +585,10 @@
+int cmd_filesystem_df(int argc, char **argv);
+
+#endif
-diff --git a/cmds-filesystem.c b/cmds-filesystem.c
-index 306f715475ac..0edfb50daca2 100644
---- a/cmds-filesystem.c
-+++ b/cmds-filesystem.c
+Index: btrfs-progs-v3.16/cmds-filesystem.c
+===================================================================
+--- btrfs-progs-v3.16.orig/cmds-filesystem.c
++++ btrfs-progs-v3.16/cmds-filesystem.c
@@ -36,6 +36,7 @@
#include "volumes.h"
#include "version.h"
@@ -599,7 +597,7 @@
#include "list_sort.h"
#include "disk-io.h"
-@@ -112,50 +113,6 @@ static const char * const filesystem_cmd_group_usage[] = {
+@@ -112,50 +113,6 @@ static const char * const filesystem_cmd
NULL
};
@@ -650,7 +648,7 @@
static int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret)
{
u64 count = 0;
-@@ -204,51 +161,6 @@ static int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret)
+@@ -204,51 +161,6 @@ static int get_df(int fd, struct btrfs_i
return 0;
}
@@ -688,7 +686,7 @@
- }
- ret = get_df(fd, &sargs);
-
-- if (!ret && sargs) {
+- if (ret == 0) {
- print_df(sargs);
- free(sargs);
- } else {
@@ -702,7 +700,7 @@
static int match_search_item_kernel(__u8 *fsid, char *mnt, char *label,
char *search)
{
-@@ -999,7 +911,7 @@ static int cmd_label(int argc, char **argv)
+@@ -999,7 +911,7 @@ static int cmd_label(int argc, char **ar
const struct cmd_group filesystem_cmd_group = {
filesystem_cmd_group_usage, NULL, {
@@ -711,11 +709,11 @@
{ "show", cmd_show, cmd_show_usage, NULL, 0 },
{ "sync", cmd_sync, cmd_sync_usage, NULL, 0 },
{ "defragment", cmd_defrag, cmd_defrag_usage, NULL, 0 },
-diff --git a/ctree.h b/ctree.h
-index a4d2cd114614..8ac17619b9dc 100644
---- a/ctree.h
-+++ b/ctree.h
-@@ -843,9 +843,10 @@ struct btrfs_csum_item {
+Index: btrfs-progs-v3.16/ctree.h
+===================================================================
+--- btrfs-progs-v3.16.orig/ctree.h
++++ btrfs-progs-v3.16/ctree.h
+@@ -845,9 +845,10 @@ struct btrfs_csum_item {
#define BTRFS_BLOCK_GROUP_RAID1 (1ULL << 4)
#define BTRFS_BLOCK_GROUP_DUP (1ULL << 5)
#define BTRFS_BLOCK_GROUP_RAID10 (1ULL << 6)
@@ -728,10 +726,10 @@
#define BTRFS_BLOCK_GROUP_TYPE_MASK (BTRFS_BLOCK_GROUP_DATA | \
BTRFS_BLOCK_GROUP_SYSTEM | \
-diff --git a/utils.c b/utils.c
-index e130849c7bb5..7731b071f353 100644
---- a/utils.c
-+++ b/utils.c
+Index: btrfs-progs-v3.16/utils.c
+===================================================================
+--- btrfs-progs-v3.16.orig/utils.c
++++ btrfs-progs-v3.16/utils.c
@@ -38,6 +38,8 @@
#include <linux/kdev_t.h>
#include <limits.h>
@@ -741,9 +739,9 @@
#include "kerncompat.h"
#include "radix-tree.h"
#include "ctree.h"
-@@ -2206,3 +2208,13 @@ int find_mount_root(const char *path, char **mount_root)
- free(longest_match);
- return ret;
+@@ -2436,3 +2438,13 @@ int test_isdir(const char *path)
+
+ return S_ISDIR(st.st_mode);
}
+
+u64 disk_size(char *path)
@@ -755,17 +753,15 @@
+ else
+ return sfs.f_bsize * sfs.f_blocks;
+}
-diff --git a/utils.h b/utils.h
-index db8d63c396d5..581faa9f6972 100644
---- a/utils.h
-+++ b/utils.h
-@@ -101,5 +101,6 @@ int get_btrfs_mount(const char *dev, char *mp, size_t mp_size);
- int find_mount_root(const char *path, char **mount_root);
- int get_device_info(int fd, u64 devid,
- struct btrfs_ioctl_dev_info_args *di_args);
+Index: btrfs-progs-v3.16/utils.h
+===================================================================
+--- btrfs-progs-v3.16.orig/utils.h
++++ btrfs-progs-v3.16/utils.h
+@@ -118,6 +118,7 @@ int test_uuid_unique(char *fs_uuid);
+ int test_minimum_size(const char *file, u32 leafsize);
+ int test_issubvolname(const char *name);
+ int test_isdir(const char *path);
+u64 disk_size(char *path);
- #endif
---
-1.9.0
-
+ /*
+ * Btrfs minimum size calculation is complicated, it should include at least:
++++++ 0012-btrfs-progs-Add-helpers-functions-to-handle-the-prin.patch ++++++
--- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200
+++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200
@@ -39,24 +39,23 @@
create mode 100644 string_table.c
create mode 100644 string_table.h
-diff --git a/Makefile b/Makefile
-index 50fb9b0ff2e3..bf6dc1c67d2c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,7 +10,7 @@ objects = ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \
+Index: btrfs-progs-v3.16/Makefile
+===================================================================
+--- btrfs-progs-v3.16.orig/Makefile
++++ btrfs-progs-v3.16/Makefile
+@@ -10,7 +10,7 @@ objects = ctree.o disk-io.o radix-tree.o
root-tree.o dir-item.o file-item.o inode-item.o inode-map.o \
extent-cache.o extent_io.o volumes.o utils.o repair.o \
qgroup.o raid6.o free-space-cache.o list_sort.o props.o \
-- utils-lib.o
-+ utils-lib.o string_table.o
+- ulist.o qgroup-verify.o
++ ulist.o qgroup-verify.o string_table.o
cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \
cmds-inspect.o cmds-balance.o cmds-send.o cmds-receive.o \
cmds-quota.o cmds-qgroup.o cmds-replace.o cmds-check.o \
-diff --git a/string_table.c b/string_table.c
-new file mode 100644
-index 000000000000..016356c50392
+Index: btrfs-progs-v3.16/string_table.c
+===================================================================
--- /dev/null
-+++ b/string_table.c
++++ btrfs-progs-v3.16/string_table.c
@@ -0,0 +1,156 @@
+/*
+ * This program is free software; you can redistribute it and/or
@@ -214,11 +213,10 @@
+ free(tab);
+
+}
-diff --git a/string_table.h b/string_table.h
-new file mode 100644
-index 000000000000..83c4425d5f76
+Index: btrfs-progs-v3.16/string_table.h
+===================================================================
--- /dev/null
-+++ b/string_table.h
++++ btrfs-progs-v3.16/string_table.h
@@ -0,0 +1,36 @@
+/*
+ * This program is free software; you can redistribute it and/or
@@ -256,6 +254,3 @@
+void table_free(struct string_table *);
+
+#endif
---
-1.9.0
-
++++++ 0013-btrfs-progs-Add-command-btrfs-filesystem-disk-usage.patch ++++++
--- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200
+++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200
@@ -13,10 +13,10 @@
utils.h | 5 +
5 files changed, 499 insertions(+)
-diff --git a/cmds-fi-disk_usage.c b/cmds-fi-disk_usage.c
-index 4012c781f20d..16b3ab250956 100644
---- a/cmds-fi-disk_usage.c
-+++ b/cmds-fi-disk_usage.c
+Index: btrfs-progs-v3.16/cmds-fi-disk_usage.c
+===================================================================
+--- btrfs-progs-v3.16.orig/cmds-fi-disk_usage.c
++++ btrfs-progs-v3.16/cmds-fi-disk_usage.c
@@ -20,10 +20,12 @@
#include <unistd.h>
#include <sys/ioctl.h>
@@ -44,7 +44,7 @@
/*
* Pretty print the size
* PAY ATTENTION: it return a statically buffer
-@@ -514,3 +523,422 @@ int cmd_filesystem_df(int argc, char **argv)
+@@ -514,3 +523,422 @@ int cmd_filesystem_df(int argc, char **a
return 0;
}
@@ -467,10 +467,10 @@
+
+ return 0;
+}
-diff --git a/cmds-fi-disk_usage.h b/cmds-fi-disk_usage.h
-index 9f68bb342d52..c7459b1521e4 100644
---- a/cmds-fi-disk_usage.h
-+++ b/cmds-fi-disk_usage.h
+Index: btrfs-progs-v3.16/cmds-fi-disk_usage.h
+===================================================================
+--- btrfs-progs-v3.16.orig/cmds-fi-disk_usage.h
++++ btrfs-progs-v3.16/cmds-fi-disk_usage.h
@@ -22,4 +22,7 @@
extern const char * const cmd_filesystem_df_usage[];
int cmd_filesystem_df(int argc, char **argv);
@@ -479,11 +479,11 @@
+int cmd_filesystem_disk_usage(int argc, char **argv);
+
#endif
-diff --git a/cmds-filesystem.c b/cmds-filesystem.c
-index 0edfb50daca2..214a0cda518c 100644
---- a/cmds-filesystem.c
-+++ b/cmds-filesystem.c
-@@ -918,6 +918,9 @@ const struct cmd_group filesystem_cmd_group = {
+Index: btrfs-progs-v3.16/cmds-filesystem.c
+===================================================================
+--- btrfs-progs-v3.16.orig/cmds-filesystem.c
++++ btrfs-progs-v3.16/cmds-filesystem.c
+@@ -918,6 +918,9 @@ const struct cmd_group filesystem_cmd_gr
{ "balance", cmd_balance, NULL, &balance_cmd_group, 1 },
{ "resize", cmd_resize, cmd_resize_usage, NULL, 0 },
{ "label", cmd_label, cmd_label_usage, NULL, 0 },
@@ -493,11 +493,11 @@
NULL_CMD_STRUCT
}
};
-diff --git a/utils.c b/utils.c
-index 7731b071f353..f2ab416c28b2 100644
---- a/utils.c
-+++ b/utils.c
-@@ -2218,3 +2218,63 @@ u64 disk_size(char *path)
+Index: btrfs-progs-v3.16/utils.c
+===================================================================
+--- btrfs-progs-v3.16.orig/utils.c
++++ btrfs-progs-v3.16/utils.c
+@@ -2448,3 +2448,63 @@ u64 disk_size(char *path)
else
return sfs.f_bsize * sfs.f_blocks;
}
@@ -561,13 +561,13 @@
+ return "unknown";
+ }
+}
-diff --git a/utils.h b/utils.h
-index 581faa9f6972..2d08e0b2a3a4 100644
---- a/utils.h
-+++ b/utils.h
-@@ -102,5 +102,10 @@ int find_mount_root(const char *path, char **mount_root);
- int get_device_info(int fd, u64 devid,
- struct btrfs_ioctl_dev_info_args *di_args);
+Index: btrfs-progs-v3.16/utils.h
+===================================================================
+--- btrfs-progs-v3.16.orig/utils.h
++++ btrfs-progs-v3.16/utils.h
+@@ -119,6 +119,11 @@ int test_minimum_size(const char *file,
+ int test_issubvolname(const char *name);
+ int test_isdir(const char *path);
u64 disk_size(char *path);
+int get_device_info(int fd, u64 devid,
+ struct btrfs_ioctl_dev_info_args *di_args);
@@ -575,7 +575,5 @@
+const char* group_type_str(u64 flags);
+const char* group_profile_str(u64 flags);
- #endif
---
-1.9.0
-
+ /*
+ * Btrfs minimum size calculation is complicated, it should include at least:
++++++ 0028-btrfs-progs-extend-pretty-printers-with-unit-mode.patch ++++++
--- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200
+++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200
@@ -14,10 +14,10 @@
utils.h | 21 +++++++++++-----
3 files changed, 66 insertions(+), 35 deletions(-)
-diff --git a/cmds-fi-disk_usage.c b/cmds-fi-disk_usage.c
-index 9d1c4085b4ea..1e412c0b0e69 100644
---- a/cmds-fi-disk_usage.c
-+++ b/cmds-fi-disk_usage.c
+Index: btrfs-progs-v3.16/cmds-fi-disk_usage.c
+===================================================================
+--- btrfs-progs-v3.16.orig/cmds-fi-disk_usage.c
++++ btrfs-progs-v3.16/cmds-fi-disk_usage.c
@@ -33,18 +33,13 @@
/*
@@ -39,11 +39,11 @@
}
/*
-diff --git a/utils.c b/utils.c
-index 159abf8bd0e4..69112be51cb2 100644
---- a/utils.c
-+++ b/utils.c
-@@ -1252,35 +1252,62 @@ out:
+Index: btrfs-progs-v3.16/utils.c
+===================================================================
+--- btrfs-progs-v3.16.orig/utils.c
++++ btrfs-progs-v3.16/utils.c
+@@ -1378,35 +1378,62 @@ out:
return ret;
}
@@ -62,10 +62,23 @@
+ int base = 0;
+ const char const **suffix = NULL;
+ u64 last_size;
++
++ if (str_size == 0)
++ return 0;
- if (str_bytes == 0)
-+ if (str_size == 0)
++ if (unit_mode == UNITS_RAW) {
++ snprintf(str, str_size, "%llu", size);
return 0;
++ }
++
++ if (unit_mode == UNITS_BINARY) {
++ base = 1024;
++ suffix = unit_suffix_binary;
++ } else if (unit_mode == UNITS_DECIMAL) {
++ base = 1000;
++ suffix = unit_suffix_decimal;
++ }
- if( size < 1024 ){
- fraction = size;
@@ -78,33 +91,21 @@
- size /= 1024;
- num_divs ++;
- }
-+ if (unit_mode == UNITS_RAW) {
-+ snprintf(str, str_size, "%llu", size);
-+ return 0;
-+ }
-
+-
- if (num_divs >= ARRAY_SIZE(size_strs)) {
- str[0] = '\0';
- return -1;
- }
- fraction = (float)last_size / 1024;
-+ if (unit_mode == UNITS_BINARY) {
-+ base = 1024;
-+ suffix = unit_suffix_binary;
-+ } else if (unit_mode == UNITS_DECIMAL) {
-+ base = 1000;
-+ suffix = unit_suffix_decimal;
- }
-- return snprintf(str, str_bytes, "%.2f%s", fraction,
-- size_strs[num_divs]);
-+
+ /* Unknown mode */
+ if (!base) {
+ fprintf(stderr, "INTERNAL ERROR: unknown unit base, mode %d",
+ unit_mode);
+ assert(0);
+ return -1;
-+ }
+ }
+- return snprintf(str, str_bytes, "%.2f%s", fraction,
+- size_strs[num_divs]);
+
+ num_divs = 0;
+ last_size = size;
@@ -128,13 +129,13 @@
}
/*
-diff --git a/utils.h b/utils.h
-index 2d08e0b2a3a4..3aea8b47d9e7 100644
---- a/utils.h
-+++ b/utils.h
-@@ -39,6 +39,14 @@
-
- #define BTRFS_UUID_UNPARSED_SIZE 37
+Index: btrfs-progs-v3.16/utils.h
+===================================================================
+--- btrfs-progs-v3.16.orig/utils.h
++++ btrfs-progs-v3.16/utils.h
+@@ -49,6 +49,14 @@ int check_argc_max(int nargs, int expect
+ void fixup_argv0(char **argv, const char *token);
+ void set_argv0(char **argv);
+/*
+ * Output mode of byte units
@@ -145,9 +146,9 @@
+#define UNITS_HUMAN UNITS_BINARY
+
int make_btrfs(int fd, const char *device, const char *label,
- u64 blocks[6], u64 num_bytes, u32 nodesize,
+ char *fs_uuid, u64 blocks[6], u64 num_bytes, u32 nodesize,
u32 leafsize, u32 sectorsize, u32 stripesize, u64 features);
-@@ -59,12 +67,13 @@ int check_mounted_where(int fd, const char *file, char *where, int size,
+@@ -71,12 +79,13 @@ int check_mounted_where(int fd, const ch
int btrfs_device_already_in_root(struct btrfs_root *root, int fd,
int super_offset);
@@ -167,6 +168,3 @@
})
int get_mountpt(char *dev, char *mntpt, size_t size);
---
-1.9.0
-
++++++ 0164-btrfs-progs-convert-set-label-or-copy-from-origin.patch ++++++
--- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200
+++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200
@@ -8,11 +8,11 @@
btrfs-convert.c | 47 ++++++++++++++++++++++++++++++++++++++---------
1 file changed, 38 insertions(+), 9 deletions(-)
-Index: btrfs-progs-v0.20-rc1-598-g8116550e1662/btrfs-convert.c
+Index: btrfs-progs-v3.16/btrfs-convert.c
===================================================================
---- btrfs-progs-v0.20-rc1-598-g8116550e1662.orig/btrfs-convert.c
-+++ btrfs-progs-v0.20-rc1-598-g8116550e1662/btrfs-convert.c
-@@ -2199,8 +2199,8 @@ err:
+--- btrfs-progs-v3.16.orig/btrfs-convert.c
++++ btrfs-progs-v3.16/btrfs-convert.c
+@@ -2196,8 +2196,8 @@ err:
return ret;
}
@@ -23,7 +23,7 @@
{
int i, ret;
int fd = -1;
-@@ -2294,6 +2294,17 @@ static int do_convert(const char *devnam
+@@ -2291,6 +2291,17 @@ static int do_convert(const char *devnam
fprintf(stderr, "error during create_ext2_image %d\n", ret);
goto fail;
}
@@ -41,7 +41,7 @@
printf("cleaning up system chunk.\n");
ret = cleanup_sys_chunk(root, ext2_root);
if (ret) {
-@@ -2688,11 +2699,13 @@ fail:
+@@ -2685,11 +2696,13 @@ fail:
static void print_usage(void)
{
@@ -60,11 +60,12 @@
}
int main(int argc, char *argv[])
-@@ -2702,9 +2715,12 @@ int main(int argc, char *argv[])
+@@ -2699,10 +2712,13 @@ int main(int argc, char *argv[])
int noxattr = 0;
int datacsum = 1;
int rollback = 0;
+ int copylabel = 0;
+ int usage_error = 0;
char *file;
+ char *fslabel = NULL;
+
@@ -74,7 +75,7 @@
if (c < 0)
break;
switch(c) {
-@@ -2720,6 +2736,19 @@ int main(int argc, char *argv[])
+@@ -2718,6 +2734,19 @@ int main(int argc, char *argv[])
case 'r':
rollback = 1;
break;
@@ -94,9 +95,9 @@
default:
print_usage();
return 1;
-@@ -2740,7 +2769,7 @@ int main(int argc, char *argv[])
+@@ -2755,7 +2784,7 @@ int main(int argc, char *argv[])
if (rollback) {
- ret = do_rollback(file, 0);
+ ret = do_rollback(file);
} else {
- ret = do_convert(file, datacsum, packing, noxattr);
+ ret = do_convert(file, datacsum, packing, noxattr, copylabel, fslabel);
++++++ library-version-defines.patch ++++++
>From f412157fd429eab3d309602de214639a8c8c584e Mon Sep 17 00:00:00 2001
From: Arvin Schnell <aschnell(a)suse.de>
Date: Mon, 3 Jun 2013 14:31:41 +0200
Subject: [PATCH] btrfs-progs: library version defines
commit 46de1a6ec3dbb0db203baa6c46cb64ba9b000ea2 changed the
parameters of btrfs_read_and_process_send_stream(). This breaks
snapper compilation. We can include version defines usable for the C
preprocessor.
Version 0.1.0: API up to and including 46de1a6ec3dbb0db2 (3.14.x)
Version 0.1.1: 909131939f750faffb9fab (changed in 3.16)
Signed-off-by: Arvin Schnell <aschnell(a)suse.de>
Signed-off-by: David Sterba <dsterba(a)suse.cz>
---
Makefile | 2 +-
send-stream.h | 5 +++++
version.sh | 17 ++++++++++++++++-
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index e721e99c8319..73ef386896bf 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ libbtrfs_objects = send-stream.o send-utils.o rbtree.o btrfs-list.o crc32c.o \
uuid-tree.o utils-lib.o
libbtrfs_headers = send-stream.h send-utils.h send.h rbtree.h btrfs-list.h \
crc32c.h list.h kerncompat.h radix-tree.h extent-cache.h \
- extent_io.h ioctl.h ctree.h btrfsck.h
+ extent_io.h ioctl.h ctree.h btrfsck.h version.h
TESTS = fsck-tests.sh convert-tests.sh
INSTALL = install
diff --git a/send-stream.h b/send-stream.h
index 293bf6af3659..bedff4d0422c 100644
--- a/send-stream.h
+++ b/send-stream.h
@@ -18,6 +18,11 @@
#ifndef SEND_STREAM_H_
#define SEND_STREAM_H_
+/*
+ * NOTE: this file is public API, any incompatible change has to update
+ * library version
+ */
+
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/version.sh b/version.sh
index 90000019fe1d..2e4a8d9e1303 100644
--- a/version.sh
+++ b/version.sh
@@ -8,6 +8,10 @@
v="v3.16"
+lib_major=0
+lib_minor=1
+lib_patchlevel=1
+
which git &> /dev/null
if [ $? == 0 -a -d .git ]; then
if head=`git rev-parse --verify HEAD 2>/dev/null`; then
@@ -24,8 +28,19 @@ if [ $? == 0 -a -d .git ]; then
fi
fi
-echo "#ifndef __BUILD_VERSION" > .build-version.h
+echo "/* NOTE: this file is autogenerated by version.sh, do not edit */" > .build-version.h
+echo "#ifndef __BUILD_VERSION" >> .build-version.h
+echo >> .build-version.h
echo "#define __BUILD_VERSION" >> .build-version.h
+echo >> .build-version.h
+echo "#define BTRFS_LIB_MAJOR $lib_major" >> .build-version.h
+echo "#define BTRFS_LIB_MINOR $lib_minor" >> .build-version.h
+echo "#define BTRFS_LIB_PATCHLEVEL $lib_patchlevel" >> .build-version.h
+echo >> .build-version.h
+echo "#define BTRFS_LIB_VERSION ( BTRFS_LIB_MAJOR * 10000 + \\" >> .build-version.h
+echo " BTRFS_LIB_MINOR * 100 + \\" >> .build-version.h
+echo " BTRFS_LIB_PATCHLEVEL )" >> .build-version.h
+echo >> .build-version.h
echo "#define BTRFS_BUILD_VERSION \"Btrfs $v\"" >> .build-version.h
echo "#endif" >> .build-version.h
--
1.9.0
++++++ local-version-override.patch ++++++
--- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200
+++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200
@@ -6,8 +6,8 @@
# Copyright 2008, Oracle
# Released under the GNU GPLv2
--v="v3.14.2"
-+v="v3.14.2+20140530"
+-v="v3.16"
++v="v3.16"
which git &> /dev/null
if [ $? == 0 -a -d .git ]; then
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package mozilla-nspr for openSUSE:Factory checked in at 2014-09-08 21:28:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mozilla-nspr (Old)
and /work/SRC/openSUSE:Factory/.mozilla-nspr.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozilla-nspr"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mozilla-nspr/mozilla-nspr.changes 2014-06-16 21:42:54.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mozilla-nspr.new/mozilla-nspr.changes 2014-09-08 21:28:16.000000000 +0200
@@ -1,0 +2,16 @@
+Fri Aug 29 11:47:40 UTC 2014 - wr(a)rosenauer.org
+
+- update to version 4.10.7
+ * bmo#836658: VC11+ defaults to SSE2 builds by default.
+ * bmo#979278: TSan: data race nsprpub/pr/src/threads/prtpd.c:103
+ PR_NewThreadPrivateIndex.
+ * bmo#1026129: Replace some manual declarations of MSVC intrinsics with
+ #include <intrin.h>.
+ * bmo#1026469: Use AC_CHECK_LIB instead of MOZ_CHECK_PTHREADS. Skip
+ compiler checks when using MSVC, even when $CC is
+ not literally "cl".
+ * bmo#1034415: NSPR hardcodes the C compiler to cl on Windows.
+ * bmo#1042408: Compilation fix for Android > API level 19.
+ * bmo#1043082: NSPR's build system hardcodes -MD.
+
+-------------------------------------------------------------------
Old:
----
nspr-4.10.6.tar.gz
New:
----
nspr-4.10.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozilla-nspr.spec ++++++
--- /var/tmp/diff_new_pack.mGcO4X/_old 2014-09-08 21:28:18.000000000 +0200
+++ /var/tmp/diff_new_pack.mGcO4X/_new 2014-09-08 21:28:18.000000000 +0200
@@ -18,7 +18,7 @@
Name: mozilla-nspr
-Version: 4.10.6
+Version: 4.10.7
Release: 0
Summary: Netscape Portable Runtime
License: MPL-2.0
++++++ nspr-4.10.6.tar.gz -> nspr-4.10.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.6/nspr/.hg_archival.txt new/nspr-4.10.7/nspr/.hg_archival.txt
--- old/nspr-4.10.6/nspr/.hg_archival.txt 2014-06-05 23:42:08.000000000 +0200
+++ new/nspr-4.10.7/nspr/.hg_archival.txt 2014-08-12 17:40:57.000000000 +0200
@@ -1,4 +1,4 @@
repo: a4b34919bf34db2ee22acbbc305693c8980b6dc6
-node: 476850821307d584874d040340f577dcde2aec38
+node: 0f03651116c5b34ba48b5a5cd31234303d9806b6
branch: default
-tag: NSPR_4_10_6_RTM
+tag: NSPR_4_10_7_RTM
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.6/nspr/configure new/nspr-4.10.7/nspr/configure
--- old/nspr-4.10.6/nspr/configure 2014-06-05 23:42:08.000000000 +0200
+++ new/nspr-4.10.7/nspr/configure 2014-08-12 17:40:57.000000000 +0200
@@ -795,6 +795,7 @@
enable_win32_target
enable_symbian_target
enable_debug_rtl
+enable_static_rtl
enable_n32
enable_x32
enable_64bit
@@ -1455,6 +1456,7 @@
--enable-symbian-target=\$t
Specify symbian flavor. (WINSCW or GCCE)
--enable-debug-rtl Use the MSVC debug runtime library
+ --enable-static-rtl Use the MSVC static runtime library
--enable-n32 Enable n32 ABI support (IRIX only)
--enable-x32 Enable x32 ABI support (x86_64 only)
--enable-64bit Enable 64-bit support (on certain platforms)
@@ -2487,7 +2489,7 @@
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=10
-MOD_PATCH_VERSION=6
+MOD_PATCH_VERSION=7
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
@@ -2576,18 +2578,19 @@
test -n "$CC" && break
done
- if test "$CC" = "cl"; then
- echo 'main() { return 0; }' > dummy.c
- ${CC} -o dummy dummy.c >/dev/null 2>&1
- if test $? = 0; then
- _WIN32_MSVC=1
- CXX=$CC
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $(CC) test failed. Using normal feature tests" >&5
-$as_echo "$as_me: WARNING: $(CC) test failed. Using normal feature tests" >&2;}
- fi
- rm -f dummy dummy.o dummy.obj dummy.exe dummy.c
+ cat > conftest.c <<EOF
+#ifdef _MSC_VER
+COMPILER IS MSVC
+#endif
+EOF
+ read dummy <<EOF
+$($CC -E conftest.c 2>/dev/null | grep COMPILER)
+EOF
+ if test -n "$dummy"; then
+ _WIN32_MSVC=1
+ CXX=$CC
fi
+ rm -f conftest.c
;;
*-mks*)
_WIN32_MSVC=1
@@ -2909,6 +2912,14 @@
fi
+# Check whether --enable-static-rtl was given.
+if test "${enable_static_rtl+set}" = set; then :
+ enableval=$enable_static_rtl; if test "$enableval" = "yes"; then
+ USE_STATIC_RTL=1
+ fi
+fi
+
+
# Check whether --enable-n32 was given.
if test "${enable_n32+set}" = set; then :
enableval=$enable_n32; if test "$enableval" = "yes"; then
@@ -7098,8 +7109,6 @@
# Use temp file for windres (bug 213281)
RCFLAGS='-O coff --use-temp-file'
else
- CC=cl
- CXX=cl
LD=link
AR='lib -NOLOGO -OUT:"$@"'
AR_FLAGS=
@@ -7186,9 +7195,17 @@
fi
if test "$USE_DEBUG_RTL" = 1; then
- CFLAGS="$CFLAGS -MDd"
+ if test -n "$USE_STATIC_RTL"; then
+ CFLAGS="$CFLAGS -MTd"
+ else
+ CFLAGS="$CFLAGS -MDd"
+ fi
else
- CFLAGS="$CFLAGS -MD"
+ if test -n "$USE_STATIC_RTL"; then
+ CFLAGS="$CFLAGS -MT"
+ else
+ CFLAGS="$CFLAGS -MD"
+ fi
fi
if test -n "$MOZ_DEBUG"; then
@@ -7270,6 +7287,9 @@
else
$as_echo "#define _X86_ 1" >>confdefs.h
+ if test -z "$GNU_CC" -a "$MSC_VER" -ge "1700"; then
+ CFLAGS="$CFLAGS -arch:IA32"
+ fi
fi
;;
x86_64)
@@ -8037,121 +8057,177 @@
;;
esac
-
-
case "$target_os" in
darwin*)
_HAVE_PTHREADS=1
;;
*)
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5
$as_echo_n "checking for pthread_create in -lpthreads... " >&6; }
-echo "
- #include <pthread.h>
- void *foo(void *v) { return v; }
- int main() {
- pthread_t t;
- if (!pthread_create(&t, 0, &foo, 0)) {
- pthread_join(t, 0);
- }
- return 0;
- }" > dummy.c ;
- echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthreads $LDFLAGS $LIBS" 1>&5;
- ${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthreads $LDFLAGS $LIBS 2>&5;
- _res=$? ;
- rm -f dummy.c dummy${ac_exeext} ;
- if test "$_res" = "0"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ${ac_cv_lib_pthreads_pthread_create+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthreads $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_create ();
+int
+main ()
+{
+return pthread_create ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_pthreads_pthread_create=yes
+else
+ ac_cv_lib_pthreads_pthread_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthreads_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthreads_pthread_create" = xyes; then :
+ _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads"
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-echo "
- #include <pthread.h>
- void *foo(void *v) { return v; }
- int main() {
- pthread_t t;
- if (!pthread_create(&t, 0, &foo, 0)) {
- pthread_join(t, 0);
- }
- return 0;
- }" > dummy.c ;
- echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthread $LDFLAGS $LIBS" 1>&5;
- ${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthread $LDFLAGS $LIBS 2>&5;
- _res=$? ;
- rm -f dummy.c dummy${ac_exeext} ;
- if test "$_res" = "0"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ${ac_cv_lib_pthread_pthread_create+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_create ();
+int
+main ()
+{
+return pthread_create ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_pthread_pthread_create=yes
+else
+ ac_cv_lib_pthread_pthread_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
+ _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread"
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5
$as_echo_n "checking for pthread_create in -lc_r... " >&6; }
-echo "
- #include <pthread.h>
- void *foo(void *v) { return v; }
- int main() {
- pthread_t t;
- if (!pthread_create(&t, 0, &foo, 0)) {
- pthread_join(t, 0);
- }
- return 0;
- }" > dummy.c ;
- echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lc_r $LDFLAGS $LIBS" 1>&5;
- ${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lc_r $LDFLAGS $LIBS 2>&5;
- _res=$? ;
- rm -f dummy.c dummy${ac_exeext} ;
- if test "$_res" = "0"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ${ac_cv_lib_c_r_pthread_create+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lc_r $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc" >&5
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_create ();
+int
+main ()
+{
+return pthread_create ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_c_r_pthread_create=yes
+else
+ ac_cv_lib_c_r_pthread_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_create" >&5
+$as_echo "$ac_cv_lib_c_r_pthread_create" >&6; }
+if test "x$ac_cv_lib_c_r_pthread_create" = xyes; then :
+ _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r"
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc" >&5
$as_echo_n "checking for pthread_create in -lc... " >&6; }
-echo "
- #include <pthread.h>
- void *foo(void *v) { return v; }
- int main() {
- pthread_t t;
- if (!pthread_create(&t, 0, &foo, 0)) {
- pthread_join(t, 0);
- }
- return 0;
- }" > dummy.c ;
- echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lc $LDFLAGS $LIBS" 1>&5;
- ${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lc $LDFLAGS $LIBS 2>&5;
- _res=$? ;
- rm -f dummy.c dummy${ac_exeext} ;
- if test "$_res" = "0"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- _HAVE_PTHREADS=1
+if ${ac_cv_lib_c_pthread_create+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lc $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_create ();
+int
+main ()
+{
+return pthread_create ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_c_pthread_create=yes
+else
+ ac_cv_lib_c_pthread_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_create" >&5
+$as_echo "$ac_cv_lib_c_pthread_create" >&6; }
+if test "x$ac_cv_lib_c_pthread_create" = xyes; then :
+ _HAVE_PTHREADS=1
- fi
+fi
- fi
+fi
- fi
+fi
- fi
+fi
;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.6/nspr/configure.in new/nspr-4.10.7/nspr/configure.in
--- old/nspr-4.10.6/nspr/configure.in 2014-06-05 23:42:08.000000000 +0200
+++ new/nspr-4.10.7/nspr/configure.in 2014-08-12 17:40:57.000000000 +0200
@@ -16,7 +16,7 @@
dnl ========================================================
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=10
-MOD_PATCH_VERSION=6
+MOD_PATCH_VERSION=7
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
@@ -72,17 +72,19 @@
# Check to see if we are really running in a msvc environemnt
_WIN32_MSVC=
AC_CHECK_PROGS(CC, cl)
- if test "$CC" = "cl"; then
- echo 'main() { return 0; }' > dummy.c
- ${CC} -o dummy dummy.c >/dev/null 2>&1
- if test $? = 0; then
- _WIN32_MSVC=1
- CXX=$CC
- else
- AC_MSG_WARN([$(CC) test failed. Using normal feature tests])
- fi
- rm -f dummy dummy.o dummy.obj dummy.exe dummy.c
+ cat > conftest.c <<EOF
+#ifdef _MSC_VER
+COMPILER IS MSVC
+#endif
+EOF
+ read dummy <<EOF
+$($CC -E conftest.c 2>/dev/null | grep COMPILER)
+EOF
+ if test -n "$dummy"; then
+ _WIN32_MSVC=1
+ CXX=$CC
fi
+ rm -f conftest.c
;;
*-mks*)
_WIN32_MSVC=1
@@ -388,6 +390,12 @@
USE_DEBUG_RTL=0
fi ])
+AC_ARG_ENABLE(static-rtl,
+ [ --enable-static-rtl Use the MSVC static runtime library],
+ [ if test "$enableval" = "yes"; then
+ USE_STATIC_RTL=1
+ fi ])
+
AC_ARG_ENABLE(n32,
[ --enable-n32 Enable n32 ABI support (IRIX only)],
[ if test "$enableval" = "yes"; then
@@ -1913,8 +1921,6 @@
# Use temp file for windres (bug 213281)
RCFLAGS='-O coff --use-temp-file'
else
- CC=cl
- CXX=cl
LD=link
AR='lib -NOLOGO -OUT:"$@"'
AR_FLAGS=
@@ -2004,9 +2010,17 @@
fi
if test "$USE_DEBUG_RTL" = 1; then
- CFLAGS="$CFLAGS -MDd"
+ if test -n "$USE_STATIC_RTL"; then
+ CFLAGS="$CFLAGS -MTd"
+ else
+ CFLAGS="$CFLAGS -MDd"
+ fi
else
- CFLAGS="$CFLAGS -MD"
+ if test -n "$USE_STATIC_RTL"; then
+ CFLAGS="$CFLAGS -MT"
+ else
+ CFLAGS="$CFLAGS -MD"
+ fi
fi
if test -n "$MOZ_DEBUG"; then
@@ -2081,6 +2095,11 @@
AC_DEFINE(_AMD64_)
else
AC_DEFINE(_X86_)
+ if test -z "$GNU_CC" -a "$MSC_VER" -ge "1700"; then
+ dnl Visual C++ 2012 defaults to -arch:SSE2. Use -arch:IA32
+ dnl to avoid requiring SSE2.
+ CFLAGS="$CFLAGS -arch:IA32"
+ fi
fi
;;
x86_64)
@@ -2643,50 +2662,18 @@
;;
esac
-dnl
-dnl Apparently, some systems cannot properly check for the pthread
-dnl library unless <pthread.h> is included so we need to test
-dnl using it
-dnl
-dnl MOZ_CHECK_PTHREADS(lib, success, failure)
-AC_DEFUN(MOZ_CHECK_PTHREADS,
-[
-AC_MSG_CHECKING([for pthread_create in -l$1])
-echo "
- #include <pthread.h>
- void *foo(void *v) { return v; }
- int main() {
- pthread_t t;
- if (!pthread_create(&t, 0, &foo, 0)) {
- pthread_join(t, 0);
- }
- return 0;
- }" > dummy.c ;
- echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -l[$1] $LDFLAGS $LIBS" 1>&5;
- ${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -l[$1] $LDFLAGS $LIBS 2>&5;
- _res=$? ;
- rm -f dummy.c dummy${ac_exeext} ;
- if test "$_res" = "0"; then
- AC_MSG_RESULT([yes])
- [$2]
- else
- AC_MSG_RESULT([no])
- [$3]
- fi
-])
-
case "$target_os" in
darwin*)
_HAVE_PTHREADS=1
;;
*)
- MOZ_CHECK_PTHREADS(pthreads,
+ AC_CHECK_LIB(pthreads, pthread_create,
_HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
- MOZ_CHECK_PTHREADS(pthread,
+ AC_CHECK_LIB(pthread, pthread_create,
_HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
- MOZ_CHECK_PTHREADS(c_r,
+ AC_CHECK_LIB(c_r, pthread_create,
_HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r",
- MOZ_CHECK_PTHREADS(c,
+ AC_CHECK_LIB(c, pthread_create,
_HAVE_PTHREADS=1
)
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.6/nspr/pr/include/pratom.h new/nspr-4.10.7/nspr/pr/include/pratom.h
--- old/nspr-4.10.6/nspr/pr/include/pratom.h 2014-06-05 23:42:08.000000000 +0200
+++ new/nspr-4.10.7/nspr/pr/include/pratom.h 2014-08-12 17:40:57.000000000 +0200
@@ -81,10 +81,7 @@
#if defined(_WIN32) && !defined(_WIN32_WCE) && \
(!defined(_MSC_VER) || (_MSC_VER >= 1310))
-long __cdecl _InterlockedIncrement(long volatile *Addend);
-long __cdecl _InterlockedDecrement(long volatile *Addend);
-long __cdecl _InterlockedExchange(long volatile *Target, long Value);
-long __cdecl _InterlockedExchangeAdd(long volatile *Addend, long Value);
+#include <intrin.h>
#ifdef _MSC_VER
#pragma intrinsic(_InterlockedIncrement)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.6/nspr/pr/include/prbit.h new/nspr-4.10.7/nspr/pr/include/prbit.h
--- old/nspr-4.10.6/nspr/pr/include/prbit.h 2014-06-05 23:42:08.000000000 +0200
+++ new/nspr-4.10.7/nspr/pr/include/prbit.h 2014-08-12 17:40:57.000000000 +0200
@@ -15,8 +15,7 @@
*/
#if defined(_WIN32) && (_MSC_VER >= 1300) && \
(defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM))
- unsigned char _BitScanForward(unsigned long * Index, unsigned long Mask);
- unsigned char _BitScanReverse(unsigned long * Index, unsigned long Mask);
+# include <intrin.h>
# pragma intrinsic(_BitScanForward,_BitScanReverse)
__forceinline static int __prBitScanForward32(unsigned int val)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.6/nspr/pr/include/prinit.h new/nspr-4.10.7/nspr/pr/include/prinit.h
--- old/nspr-4.10.6/nspr/pr/include/prinit.h 2014-06-05 23:42:08.000000000 +0200
+++ new/nspr-4.10.7/nspr/pr/include/prinit.h 2014-08-12 17:40:57.000000000 +0200
@@ -31,10 +31,10 @@
** The format of the version string is
** "<major version>.<minor version>[.<patch level>] [<Beta>]"
*/
-#define PR_VERSION "4.10.6"
+#define PR_VERSION "4.10.7"
#define PR_VMAJOR 4
#define PR_VMINOR 10
-#define PR_VPATCH 6
+#define PR_VPATCH 7
#define PR_BETA PR_FALSE
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.6/nspr/pr/src/md/unix/unix.c new/nspr-4.10.7/nspr/pr/src/md/unix/unix.c
--- old/nspr-4.10.6/nspr/pr/src/md/unix/unix.c 2014-06-05 23:42:08.000000000 +0200
+++ new/nspr-4.10.7/nspr/pr/src/md/unix/unix.c 2014-08-12 17:40:57.000000000 +0200
@@ -21,6 +21,10 @@
#include <poll.h>
#endif
+#if defined(ANDROID)
+#include <android/api-level.h>
+#endif
+
/* To get FIONREAD */
#if defined(UNIXWARE)
#include <sys/filio.h>
@@ -2709,8 +2713,8 @@
} /* _MD_Unix_mmap64 */
#endif /* defined(_PR_NO_LARGE_FILES) || defined(SOLARIS2_5) */
-/* Android doesn't have mmap64. */
-#if defined(ANDROID)
+/* Android <= 19 doesn't have mmap64. */
+#if defined(ANDROID) && __ANDROID_API__ <= 19
extern void *__mmap2(void *, size_t, int, int, int, size_t);
#define ANDROID_PAGE_SIZE 4096
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.6/nspr/pr/src/threads/prtpd.c new/nspr-4.10.7/nspr/pr/src/threads/prtpd.c
--- old/nspr-4.10.6/nspr/pr/src/threads/prtpd.c 2014-06-05 23:42:08.000000000 +0200
+++ new/nspr-4.10.7/nspr/pr/src/threads/prtpd.c 2014-08-12 17:40:57.000000000 +0200
@@ -130,8 +130,9 @@
** destructor function and a non-NULL per-thread-private data value,
** the destructor function is invoked.
**
-** This can return PR_FAILURE if index is invalid (ie., beyond the current
-** high water mark) or memory is insufficient to allocate an exanded vector.
+** This can return PR_FAILURE if index is invalid (ie., beyond the limit
+** on the TPD slots) or memory is insufficient to allocate an expanded
+** vector.
*/
PR_IMPLEMENT(PRStatus) PR_SetThreadPrivate(PRUintn index, void *priv)
@@ -139,11 +140,10 @@
PRThread *self = PR_GetCurrentThread();
/*
- ** The index being set might not have a sufficient vector in this
- ** thread. But if the index has been allocated, it's okay to go
- ** ahead and extend this one now.
+ ** To improve performance, we don't check if the index has been
+ ** allocated.
*/
- if ((index >= _PR_TPD_LIMIT) || (index >= _pr_tpd_highwater))
+ if (index >= _PR_TPD_LIMIT)
{
PR_SetError(PR_TPD_RANGE_ERROR, 0);
return PR_FAILURE;
@@ -152,6 +152,10 @@
PR_ASSERT(((NULL == self->privateData) && (0 == self->tpdLength))
|| ((NULL != self->privateData) && (0 != self->tpdLength)));
+ /*
+ ** If this thread does not have a sufficient vector for the index
+ ** being set, go ahead and extend this vector now.
+ */
if ((NULL == self->privateData) || (self->tpdLength <= index))
{
void *extension = PR_CALLOC(_pr_tpd_length * sizeof(void*));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.6/nspr/pr/tests/vercheck.c new/nspr-4.10.7/nspr/pr/tests/vercheck.c
--- old/nspr-4.10.6/nspr/pr/tests/vercheck.c 2014-06-05 23:42:08.000000000 +0200
+++ new/nspr-4.10.7/nspr/pr/tests/vercheck.c 2014-08-12 17:40:57.000000000 +0200
@@ -20,10 +20,10 @@
#include <stdlib.h>
/*
- * This release (4.10.6) is backward compatible with the
+ * This release (4.10.7) is backward compatible with the
* 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6.x, 4.7.x,
- * 4.8.x, 4.9.x, 4.10, 4.10.1, 4.10.2, 4.10.3, 4.10.4, and
- * 4.10.5 releases.
+ * 4.8.x, 4.9.x, 4.10, 4.10.1, 4.10.2, 4.10.3, 4.10.4,
+ * 4.10.5, and 4.10.6 releases.
* It, of course, is compatible with itself.
*/
static char *compatible_version[] = {
@@ -39,7 +39,7 @@
"4.9", "4.9.1", "4.9.2", "4.9.3", "4.9.4", "4.9.5",
"4.9.6",
"4.10", "4.10.1", "4.10.2", "4.10.3", "4.10.4",
- "4.10.5",
+ "4.10.5", "4.10.6",
PR_VERSION
};
@@ -55,7 +55,7 @@
"3.0", "3.0.1",
"3.1", "3.1.1", "3.1.2", "3.1.3",
"3.5", "3.5.1",
- "4.10.7",
+ "4.10.8",
"4.11", "4.11.1",
"10.0", "11.1", "12.14.20"
};
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package mozilla-nss for openSUSE:Factory checked in at 2014-09-08 21:28:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mozilla-nss (Old)
and /work/SRC/openSUSE:Factory/.mozilla-nss.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozilla-nss"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mozilla-nss/mozilla-nss.changes 2014-08-15 09:58:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mozilla-nss.new/mozilla-nss.changes 2014-09-08 21:28:14.000000000 +0200
@@ -1,0 +2,22 @@
+Fri Aug 29 11:53:10 UTC 2014 - wr(a)rosenauer.org
+
+- update to 3.17
+ * required for Firefox 33
+ New functionality:
+ * When using ECDHE, the TLS server code may be configured to generate
+ a fresh ephemeral ECDH key for each handshake, by setting the
+ SSL_REUSE_SERVER_ECDHE_KEY socket option to PR_FALSE. The
+ SSL_REUSE_SERVER_ECDHE_KEY option defaults to PR_TRUE, which means
+ the server's ephemeral ECDH key is reused for multiple handshakes.
+ This option does not affect the TLS client code, which always
+ generates a fresh ephemeral ECDH key for each handshake.
+ New Macros
+ * SSL_REUSE_SERVER_ECDHE_KEY
+ Notable Changes:
+ * The manual pages for the certutil and pp tools have been updated to
+ document the new parameters that had been added in NSS 3.16.2.
+ * On Windows, the new build variable USE_STATIC_RTL can be used to
+ specify the static C runtime library should be used. By default the
+ dynamic C runtime library is used.
+
+-------------------------------------------------------------------
@@ -4 +26 @@
-- update to 3.16.4
+- update to 3.16.4 (bnc#894201)
Old:
----
nss-3.16.4.tar.gz
New:
----
nss-3.17.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozilla-nss.spec ++++++
--- /var/tmp/diff_new_pack.aSWvdd/_old 2014-09-08 21:28:16.000000000 +0200
+++ /var/tmp/diff_new_pack.aSWvdd/_new 2014-09-08 21:28:16.000000000 +0200
@@ -21,11 +21,11 @@
Name: mozilla-nss
BuildRequires: gcc-c++
-BuildRequires: mozilla-nspr-devel >= 4.10.5
+BuildRequires: mozilla-nspr-devel >= 4.10.7
BuildRequires: pkg-config
BuildRequires: sqlite-devel
BuildRequires: zlib-devel
-Version: 3.16.4
+Version: 3.17
Release: 0
# bug437293
%ifarch ppc64
@@ -36,8 +36,8 @@
License: MPL-2.0
Group: System/Libraries
Url: http://www.mozilla.org/projects/security/pki/nss/
-Source: https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_4_RT…
-# hg clone https://hg.mozilla.org/projects/nss nss-3.16/nss ; cd nss-3.16/nss ; hg up NSS_3_16_RTM
+Source: https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_RTM/…
+# hg clone https://hg.mozilla.org/projects/nss nss-3.17/nss ; cd nss-3.17/nss ; hg up NSS_3_17_RTM
#Source: nss-%{version}.tar.gz
Source1: nss.pc.in
Source3: nss-config.in
++++++ nss-3.16.4.tar.gz -> nss-3.17.tar.gz ++++++
/work/SRC/openSUSE:Factory/mozilla-nss/nss-3.16.4.tar.gz /work/SRC/openSUSE:Factory/.mozilla-nss.new/nss-3.17.tar.gz differ: char 5, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package snapper for openSUSE:Factory checked in at 2014-09-08 21:28:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/snapper (Old)
and /work/SRC/openSUSE:Factory/.snapper.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "snapper"
Changes:
--------
--- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2014-08-03 15:36:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2014-09-08 21:28:12.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Aug 27 17:55:32 CEST 2014 - dsterba(a)suse.cz
+
+- conditional check for libbtrfs API version
+
+-------------------------------------------------------------------
+Thu Aug 14 14:15:21 CEST 2014 - aschnell(a)suse.de
+
+- cleanup after failed create-config (bnc#863578)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ snapper-0.2.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.3/config.h.in new/snapper-0.2.3/config.h.in
--- old/snapper-0.2.3/config.h.in 2014-08-01 10:14:16.000000000 +0200
+++ new/snapper-0.2.3/config.h.in 2014-09-04 12:28:54.000000000 +0200
@@ -30,6 +30,9 @@
/* Enable extended attributes support */
#undef ENABLE_XATTRS
+/* Define to 1 if you have the <btrfs/version.h> header file. */
+#undef HAVE_BTRFS_VERSION_H
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.3/configure new/snapper-0.2.3/configure
--- old/snapper-0.2.3/configure 2014-08-01 10:14:15.000000000 +0200
+++ new/snapper-0.2.3/configure 2014-09-04 12:28:53.000000000 +0200
@@ -1960,6 +1960,93 @@
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_link
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if eval \${$3+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
@@ -15832,6 +15919,18 @@
fi
+for ac_header in btrfs/version.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "btrfs/version.h" "ac_cv_header_btrfs_version_h" "$ac_includes_default"
+if test "x$ac_cv_header_btrfs_version_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_BTRFS_VERSION_H 1
+_ACEOF
+
+fi
+
+done
+
# Check whether --enable-xattrs was given.
if test "${enable_xattrs+set}" = set; then :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.3/configure.ac new/snapper-0.2.3/configure.ac
--- old/snapper-0.2.3/configure.ac 2014-06-30 15:03:26.000000000 +0200
+++ new/snapper-0.2.3/configure.ac 2014-09-01 15:52:46.000000000 +0200
@@ -102,6 +102,7 @@
AM_CONDITIONAL(HAVE_ZYPP, [test "x$with_zypp" = "xyes"])
AC_CHECK_LIB(btrfs, btrfs_read_and_process_send_stream)
+AC_CHECK_HEADERS([btrfs/version.h])
AC_ARG_ENABLE([xattrs], AC_HELP_STRING([--disable-xattrs],[Disable extended attributes support]),
[with_xattrs=$enableval],[with_xattrs=yes])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.3/snapper/Btrfs.cc new/snapper-0.2.3/snapper/Btrfs.cc
--- old/snapper-0.2.3/snapper/Btrfs.cc 2014-06-30 15:03:26.000000000 +0200
+++ new/snapper-0.2.3/snapper/Btrfs.cc 2014-09-01 15:52:46.000000000 +0200
@@ -34,6 +34,11 @@
#include <libmount/libmount.h>
#endif
#ifdef HAVE_LIBBTRFS
+#ifdef HAVE_BTRFS_VERSION_H
+#include <btrfs/version.h>
+#else
+#define BTRFS_LIB_VERSION (100)
+#endif
#include <btrfs/ioctl.h>
#include <btrfs/send.h>
#include <btrfs/send-stream.h>
@@ -1142,7 +1147,13 @@
boost::this_thread::interruption_point();
// remove the fourth parameter for older versions of libbtrfs
- int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this, 0);
+ int r;
+
+#if BTRFS_LIB_VERSION < 101
+ r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this, 0);
+#else
+ r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this, 0, 1);
+#endif
if (r < 0)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.3/snapper/Snapper.cc new/snapper-0.2.3/snapper/Snapper.cc
--- old/snapper-0.2.3/snapper/Snapper.cc 2014-06-30 15:03:26.000000000 +0200
+++ new/snapper-0.2.3/snapper/Snapper.cc 2014-09-01 15:40:38.000000000 +0200
@@ -403,7 +403,23 @@
throw CreateConfigFailedException("modifying config failed");
}
- filesystem->createConfig(add_fstab);
+ try
+ {
+ filesystem->createConfig(add_fstab);
+ }
+ catch (...)
+ {
+ SysconfigFile sysconfig(SYSCONFIGFILE);
+ vector<string> config_names;
+ sysconfig.getValue("SNAPPER_CONFIGS", config_names);
+ config_names.erase(remove(config_names.begin(), config_names.end(), config_name),
+ config_names.end());
+ sysconfig.setValue("SNAPPER_CONFIGS", config_names);
+
+ SystemCmd cmd(RMBIN " " + quote(CONFIGSDIR "/" + config_name));
+
+ throw;
+ }
#ifdef ENABLE_ROLLBACK
if (subvolume == "/" && filesystem->fstype() == "btrfs" &&
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package enigmail for openSUSE:13.1:Update checked in at 2014-09-08 15:50:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1:Update/enigmail (Old)
and /work/SRC/openSUSE:13.1:Update/.enigmail.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "enigmail"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.fWZpML/_old 2014-09-08 15:50:57.000000000 +0200
+++ /var/tmp/diff_new_pack.fWZpML/_new 2014-09-08 15:50:57.000000000 +0200
@@ -1 +1 @@
-<link package='enigmail.2922' cicount='copy' />
+<link package='enigmail.2978' cicount='copy' />
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package enigmail for openSUSE:12.3:Update checked in at 2014-09-08 15:50:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3:Update/enigmail (Old)
and /work/SRC/openSUSE:12.3:Update/.enigmail.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "enigmail"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.2djSuz/_old 2014-09-08 15:50:54.000000000 +0200
+++ /var/tmp/diff_new_pack.2djSuz/_new 2014-09-08 15:50:54.000000000 +0200
@@ -1 +1 @@
-<link package='enigmail.2922' cicount='copy' />
+<link package='enigmail.2978' cicount='copy' />
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package rsyslog for openSUSE:13.1:Update checked in at 2014-09-08 08:00:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1:Update/rsyslog (Old)
and /work/SRC/openSUSE:13.1:Update/.rsyslog.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rsyslog"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.DfNvgr/_old 2014-09-08 10:25:46.000000000 +0200
+++ /var/tmp/diff_new_pack.DfNvgr/_new 2014-09-08 10:25:46.000000000 +0200
@@ -1 +1 @@
-<link package='rsyslog.2377' cicount='copy' />
+<link package='rsyslog.2976' cicount='copy' />
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package rsyslog for openSUSE:12.3:Update checked in at 2014-09-08 08:00:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3:Update/rsyslog (Old)
and /work/SRC/openSUSE:12.3:Update/.rsyslog.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rsyslog"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.36tRYL/_old 2014-09-08 10:25:45.000000000 +0200
+++ /var/tmp/diff_new_pack.36tRYL/_new 2014-09-08 10:25:45.000000000 +0200
@@ -1 +1 @@
-<link package='rsyslog.1640' cicount='copy' />
+<link package='rsyslog.2976' cicount='copy' />
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package tcl for openSUSE:Factory checked in at 2014-09-07 11:11:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tcl (Old)
and /work/SRC/openSUSE:Factory/.tcl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tcl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/tcl/tcl.changes 2013-09-23 11:18:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.tcl.new/tcl.changes 2014-09-07 11:11:56.000000000 +0200
@@ -1,0 +2,58 @@
+Sat Sep 6 10:23:13 UTC 2014 - coolo(a)suse.de
+
+- avoid %nil to pass download_files service
+
+-------------------------------------------------------------------
+Mon Sep 1 07:45:22 UTC 2014 - fcrozat(a)suse.com
+
+- Update license tag to SPDX 1.2.
+
+-------------------------------------------------------------------
+Thu Aug 28 14:24:16 UTC 2014 - vwallfahrer(a)suse.com
+
+- Update to 8.6.2:
+ * TIP 429: New command [string cat].
+ * [lsearch -integer], [lsort -integer] operate on wide ints.
+ *** POTENTIAL INCOMPATIBILITY ***
+ * [dict replace], [dict remove] return canonical dicts.
+ *** POTENTIAL INCOMPATIBILITY ***
+ * Improved ::env synchronization with environment.
+ * transchans converted blocked writes to errors.
+ * [info class subclasses ::oo::object] includes ::oo::class .
+ * Fix: [chan configure -error] breaks [socket -async] connection.
+ * Better handle NUL in filenames.
+ * Fix: failures in nested ensemble bytecode compiler.
+ * Fixed crashes in...
+ - [apply {{} {while 1 {a {*}
+ [return -level 0 -code continue]}}}]
+ - [apply {{} {namespace upvar a b [x]}}]
+ - [coroutine X coroutine Y info frame]
+ - multi-interp font teardown
+ - oo chain deletion
+ * Plugged memory leaks in...
+ - execution traced coroutine deletion
+ - [close [zlib push ... -dictionary ...]]
+ - AtForkChild()
+ - managing oo instance lists
+ * Performance addressed in...
+ - [lappend l $multiple $arg] compile: quadratic -> linear
+ - binary [chan copy]: move bytes instead of copy
+ - Improved bytecode: [catch], [foreach], [lmap],
+ num. conversion
+ * Bytecode compiled: [concat], [linsert], [namespace origin],
+ [next], [nextto], [string is], [string replace],
+ [string tolower], [string totitle], [string toupper],
+ [string trim], [string trimleft],
+ [string trimright] [yieldto]
+ * New package releases:
+ http 2.8.8: Accept upper case schemes in URLs
+ tcltest 2.3.7: cleanup runs before output comparisons
+ platform 1.0.13: Update macosx-* variant compatibilities
+ TclOO 1.0.2
+ itcl 4.0.1
+ thread 2.7.1
+ sqlite3 3.8.6
+ tdbc* 1.0.1
+- removed tcl-unload.patch and tcl.patch
+
+-------------------------------------------------------------------
Old:
----
tcl-unload.patch
tcl.patch
tcl8.6.1-src.tar.gz
New:
----
tcl8.6.2-src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tcl.spec ++++++
--- /var/tmp/diff_new_pack.pYqgI4/_old 2014-09-07 11:11:58.000000000 +0200
+++ /var/tmp/diff_new_pack.pYqgI4/_new 2014-09-07 11:11:58.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package tcl
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,13 +18,13 @@
Name: tcl
Url: http://www.tcl.tk
-Version: 8.6.1
+Version: 8.6.2
Release: 0
-%define rrc %nil
+%define rrc %{nil}
%define TCL_MINOR %(echo %version | cut -c1-3)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: The Tcl Programming Language
-License: SUSE-TCL
+License: TCL
Group: Development/Languages/Tcl
# bug437293
%ifarch ppc64
@@ -36,7 +36,7 @@
Obsoletes: itcl < 4.0.0
Provides: itcl = 4.0.0
PreReq: /bin/rm
-Source0: ftp://ftp.tcl.tk/pub/tcl/tcl8_6/%name%{version}%{rrc}-src.tar.gz
+Source0: ftp://ftp.tcl.tk/pub/tcl/tcl8_6/%{name}%{version}%{rrc}-src.tar.gz
Source1: tcl-rpmlintrc
Source2: baselibs.conf
Source3: macros.tcl
++++++ tcl8.6.1-src.tar.gz -> tcl8.6.2-src.tar.gz ++++++
/work/SRC/openSUSE:Factory/tcl/tcl8.6.1-src.tar.gz /work/SRC/openSUSE:Factory/.tcl.new/tcl8.6.2-src.tar.gz differ: char 5, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0