openSUSE Commits
Threads by month
- ----- 2024 -----
- October
- September
- August
- July
- 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-qtquickcontrols for openSUSE:Factory checked in at 2014-09-18 07:56:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtquickcontrols (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtquickcontrols.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtquickcontrols"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtquickcontrols/libqt5-qtquickcontrols.changes 2014-09-07 11:10:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtquickcontrols.new/libqt5-qtquickcontrols.changes 2014-09-18 07:56:55.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 16 11:27:53 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2 final
+ * No changes since previous snapshot
+ * Use official tars
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtquickcontrols.spec ++++++
--- /var/tmp/diff_new_pack.5hvJL8/_old 2014-09-18 07:56:56.000000000 +0200
+++ /var/tmp/diff_new_pack.5hvJL8/_new 2014-09-18 07:56:56.000000000 +0200
@@ -16,10 +16,10 @@
#
-%define qt5_snapshot 1
+%define qt5_snapshot 0
Name: libqt5-qtquickcontrols
-Version: 5.3.2~git20140904
+Version: 5.3.2
Release: 0
Summary: Qt 5 Quick Controls Addon
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
++++++ qtquickcontrols-opensource-src-5.3.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquickcontrols-opensource-src-5.3.2/.tag new/qtquickcontrols-opensource-src-5.3.2/.tag
--- old/qtquickcontrols-opensource-src-5.3.2/.tag 2014-09-05 14:23:37.000000000 +0200
+++ new/qtquickcontrols-opensource-src-5.3.2/.tag 2014-09-11 12:47:53.000000000 +0200
@@ -1 +1 @@
-a7d03f54eeac78326753fa069b6a60557201904f
+d70e5ebe11a8eb22fe5e71945982d81991dc9f09
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow.cpp new/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow.cpp
--- old/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow.cpp 2014-09-05 14:23:37.000000000 +0200
+++ new/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow.cpp 2014-09-11 12:47:53.000000000 +0200
@@ -50,8 +50,10 @@
QT_BEGIN_NAMESPACE
QQuickMenuPopupWindow::QQuickMenuPopupWindow() :
- QQuickPopupWindow(), m_itemAt(0)
-{ }
+ m_itemAt(0),
+ m_logicalParentWindow(0)
+{
+}
void QQuickMenuPopupWindow::show()
{
@@ -59,6 +61,10 @@
// show() will reposition the popup at the last moment,
// so its initial position must be captured after the call.
m_initialPos = position();
+ if (m_logicalParentWindow && m_logicalParentWindow->parent()) {
+ // This must be a QQuickWindow embedded via createWindowContainer.
+ m_initialPos += m_logicalParentWindow->geometry().topLeft();
+ }
}
void QQuickMenuPopupWindow::setParentItem(QQuickItem *item)
@@ -88,8 +94,11 @@
void QQuickMenuPopupWindow::setParentWindow(QWindow *effectiveParentWindow, QQuickWindow *parentWindow)
{
+ while (effectiveParentWindow && effectiveParentWindow->parent())
+ effectiveParentWindow = effectiveParentWindow->parent();
if (transientParent() != effectiveParentWindow)
setTransientParent(effectiveParentWindow);
+ m_logicalParentWindow = parentWindow;
if (parentWindow) {
connect(parentWindow, SIGNAL(destroyed()), this, SLOT(dismissPopup()));
if (QQuickMenuPopupWindow *pw = qobject_cast<QQuickMenuPopupWindow *>(parentWindow))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow_p.h new/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow_p.h
--- old/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow_p.h 2014-09-05 14:23:37.000000000 +0200
+++ new/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow_p.h 2014-09-11 12:47:53.000000000 +0200
@@ -69,6 +69,7 @@
QQuickItem *m_itemAt;
QPointF m_oldItemPos;
QPointF m_initialPos;
+ QQuickWindow *m_logicalParentWindow;
};
QT_END_NAMESPACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickpopupwindow.cpp new/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickpopupwindow.cpp
--- old/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickpopupwindow.cpp 2014-09-05 14:23:37.000000000 +0200
+++ new/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickpopupwindow.cpp 2014-09-11 12:47:53.000000000 +0200
@@ -68,23 +68,16 @@
{
qreal posx = x();
qreal posy = y();
- if (QQuickWindow *parentWindow = qobject_cast<QQuickWindow *>(transientParent())) {
+ // transientParent may not be a QQuickWindow when embedding into widgets
+ if (QWindow *tp = transientParent()) {
if (m_parentItem) {
- QPointF pos = m_parentItem->mapToItem(parentWindow->contentItem(), QPointF(posx, posy));
+ QPointF pos = m_parentItem->mapToItem(m_parentItem->window()->contentItem(), QPointF(posx, posy));
posx = pos.x();
posy = pos.y();
}
-
- if (parentWindow->parent()) {
- // If the parent window is embedded in another window, the offset needs to be relative to
- // its top-level window container, or to global coordinates, which is the same in the end.
- QPoint parentWindowOffset = parentWindow->mapToGlobal(QPoint());
- posx += parentWindowOffset.x();
- posy += parentWindowOffset.y();
- } else {
- posx += parentWindow->geometry().left();
- posy += parentWindow->geometry().top();
- }
+ QPoint tlwOffset = tp->mapToGlobal(QPoint());
+ posx += tlwOffset.x();
+ posy += tlwOffset.y();
} else if (m_parentItem && m_parentItem->window()) {
QPoint offset;
QQuickWindow *quickWindow = m_parentItem->window();
--
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-18 07:56:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-09-08 21:28:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtquick1.new/libqt5-qtquick1.changes 2014-09-18 07:56:53.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 16 11:27:53 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2 final
+ * No changes since previous snapshot
+ * Use official tars
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtquick1.spec ++++++
--- /var/tmp/diff_new_pack.ujHKfW/_old 2014-09-18 07:56:55.000000000 +0200
+++ /var/tmp/diff_new_pack.ujHKfW/_new 2014-09-18 07:56:55.000000000 +0200
@@ -16,12 +16,12 @@
#
-%define qt5_snapshot 1
+%define qt5_snapshot 0
%define libname libQt5Declarative5
Name: libqt5-qtquick1
-Version: 5.3.2~git20140904
+Version: 5.3.2
Release: 0
Summary: Qt 5 Quick1 Library
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
++++++ qtquick1-opensource-src-5.3.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qtquick1/qtquick1-opensource-src-5.3.2.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-18 07:56:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-09-08 21:28:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtmultimedia.new/libqt5-qtmultimedia.changes 2014-09-18 07:56:49.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 16 11:27:52 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2 final
+ * No changes since previous snapshot
+ * Use official tars
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtmultimedia.spec ++++++
--- /var/tmp/diff_new_pack.3seXIf/_old 2014-09-18 07:56:51.000000000 +0200
+++ /var/tmp/diff_new_pack.3seXIf/_new 2014-09-18 07:56:51.000000000 +0200
@@ -16,12 +16,12 @@
#
-%define qt5_snapshot 1
+%define qt5_snapshot 0
%define libname libQt5Multimedia5
Name: libqt5-qtmultimedia
-Version: 5.3.2~git20140904
+Version: 5.3.2
Release: 0
Summary: Qt 5 Multimedia Library
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
++++++ qtmultimedia-opensource-src-5.3.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/gstvideoconnector_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/gstvideoconnector_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/gstvideoconnector_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/gstvideoconnector_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/gstvideoconnector_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/playlistfileparser_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/playlistfileparser_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/playlistfileparser_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/playlistfileparser_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/playback/playlistfileparser_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qabstractvideobuffer_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qabstractvideobuffer_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qabstractvideobuffer_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qabstractvideobuffer_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/video/qabstractvideobuffer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qaudiobuffer_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qaudiobuffer_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qaudiobuffer_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qaudiobuffer_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/audio/qaudiobuffer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qaudiodevicefactory_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qaudiodevicefactory_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qaudiodevicefactory_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qaudiodevicefactory_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/audio/qaudiodevicefactory_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qaudiohelpers_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qaudiohelpers_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qaudiohelpers_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qaudiohelpers_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/audio/qaudiohelpers_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qcamera_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qcamera_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qcamera_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qcamera_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/camera/qcamera_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qdeclarativevideooutput_backend_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qdeclarativevideooutput_backend_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qdeclarativevideooutput_backend_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qdeclarativevideooutput_backend_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_backend_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qdeclarativevideooutput_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qdeclarativevideooutput_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qdeclarativevideooutput_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qdeclarativevideooutput_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstappsrc_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstappsrc_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstappsrc_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstappsrc_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstappsrc_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstbufferpoolinterface_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstbufferpoolinterface_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstbufferpoolinterface_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstbufferpoolinterface_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstcodecsinfo_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstcodecsinfo_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstcodecsinfo_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstcodecsinfo_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstcodecsinfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreameraudioinputselector_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreameraudioinputselector_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreameraudioinputselector_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreameraudioinputselector_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstreameraudioinputselector_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreameraudioprobecontrol_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreameraudioprobecontrol_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreameraudioprobecontrol_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreameraudioprobecontrol_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstreameraudioprobecontrol_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamerbushelper_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamerbushelper_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamerbushelper_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamerbushelper_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstreamerbushelper_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamergltexturerenderer_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamergltexturerenderer_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamergltexturerenderer_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamergltexturerenderer_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstreamergltexturerenderer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamermessage_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamermessage_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamermessage_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamermessage_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstreamermessage_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideoinputdevicecontrol_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideoinputdevicecontrol_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideoinputdevicecontrol_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideoinputdevicecontrol_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideoprobecontrol_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideoprobecontrol_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideoprobecontrol_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideoprobecontrol_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideorenderer_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideorenderer_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideorenderer_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideorenderer_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideorendererinterface_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideorendererinterface_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideorendererinterface_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideorendererinterface_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstreamervideorendererinterface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideowidget_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideowidget_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideowidget_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideowidget_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstreamervideowidget_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideowindow_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideowindow_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideowindow_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstreamervideowindow_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstreamervideowindow_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstutils_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstutils_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstutils_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstutils_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstutils_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstvideobuffer_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstvideobuffer_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstvideobuffer_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qgstvideobuffer_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qgstvideobuffer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qimagevideobuffer_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qimagevideobuffer_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qimagevideobuffer_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qimagevideobuffer_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/video/qimagevideobuffer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediacontrol_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediacontrol_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediacontrol_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediacontrol_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/qmediacontrol_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmedianetworkplaylistprovider_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmedianetworkplaylistprovider_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmedianetworkplaylistprovider_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmedianetworkplaylistprovider_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/playback/qmedianetworkplaylistprovider_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaobject_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaobject_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaobject_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaobject_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/qmediaobject_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylist_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylist_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylist_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylist_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/playback/qmediaplaylist_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistcontrol_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistcontrol_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistcontrol_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistcontrol_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/controls/qmediaplaylistcontrol_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistioplugin_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistioplugin_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistioplugin_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistioplugin_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/playback/qmediaplaylistioplugin_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistnavigator_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistnavigator_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistnavigator_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistnavigator_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/playback/qmediaplaylistnavigator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistprovider_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistprovider_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistprovider_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistprovider_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/playback/qmediaplaylistprovider_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistsourcecontrol_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistsourcecontrol_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistsourcecontrol_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaplaylistsourcecontrol_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/controls/qmediaplaylistsourcecontrol_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediapluginloader_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediapluginloader_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediapluginloader_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediapluginloader_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/qmediapluginloader_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediarecorder_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediarecorder_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediarecorder_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediarecorder_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/recording/qmediarecorder_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaresourcepolicy_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaresourcepolicy_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaresourcepolicy_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaresourcepolicy_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/qmediaresourcepolicy_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaresourcepolicyplugin_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaresourcepolicyplugin_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaresourcepolicyplugin_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaresourcepolicyplugin_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/qmediaresourcepolicyplugin_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaresourceset_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaresourceset_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaresourceset_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaresourceset_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/qmediaresourceset_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaservice_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaservice_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaservice_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaservice_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/qmediaservice_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaserviceprovider_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaserviceprovider_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaserviceprovider_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediaserviceprovider_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/qmediaserviceprovider_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediastoragelocation_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediastoragelocation_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediastoragelocation_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmediastoragelocation_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/qmediastoragelocation_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmemoryvideobuffer_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmemoryvideobuffer_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmemoryvideobuffer_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qmemoryvideobuffer_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/video/qmemoryvideobuffer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsamplecache_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsamplecache_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsamplecache_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsamplecache_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/audio/qsamplecache_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsgvideonode_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsgvideonode_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsgvideonode_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsgvideonode_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsoundeffect_pulse_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsoundeffect_pulse_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsoundeffect_pulse_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsoundeffect_pulse_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/audio/qsoundeffect_pulse_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsoundeffect_qaudio_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsoundeffect_qaudio_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsoundeffect_qaudio_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qsoundeffect_qaudio_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/audio/qsoundeffect_qaudio_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qtmultimediaquickdefs_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qtmultimediaquickdefs_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qtmultimediaquickdefs_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qtmultimediaquickdefs_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qvideooutputorientationhandler_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qvideooutputorientationhandler_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qvideooutputorientationhandler_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qvideooutputorientationhandler_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/video/qvideooutputorientationhandler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qvideosurfacegstsink_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qvideosurfacegstsink_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qvideosurfacegstsink_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qvideosurfacegstsink_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qvideosurfaceoutput_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qvideosurfaceoutput_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qvideosurfaceoutput_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qvideosurfaceoutput_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/video/qvideosurfaceoutput_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qwavedecoder_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qwavedecoder_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qwavedecoder_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/5.3.2/QtMultimedia/private/qwavedecoder_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimedia/audio/qwavedecoder_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractAudioDeviceInfo new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractAudioDeviceInfo
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractAudioDeviceInfo 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractAudioDeviceInfo 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudiosystem.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractAudioInput new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractAudioInput
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractAudioInput 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractAudioInput 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudiosystem.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractAudioOutput new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractAudioOutput
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractAudioOutput 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractAudioOutput 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudiosystem.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractVideoBuffer new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractVideoBuffer
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractVideoBuffer 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractVideoBuffer 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qabstractvideobuffer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractVideoSurface new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractVideoSurface
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractVideoSurface 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAbstractVideoSurface 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qabstractvideosurface.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudio new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudio
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudio 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudio 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudio.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioBuffer new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioBuffer
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioBuffer 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioBuffer 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudiobuffer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioDecoder new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioDecoder
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioDecoder 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioDecoder 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudiodecoder.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioDecoderControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioDecoderControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioDecoderControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioDecoderControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudiodecodercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioDeviceInfo new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioDeviceInfo
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioDeviceInfo 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioDeviceInfo 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudiodeviceinfo.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioEncoderSettings new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioEncoderSettings
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioEncoderSettings 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioEncoderSettings 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaencodersettings.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioEncoderSettingsControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioEncoderSettingsControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioEncoderSettingsControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioEncoderSettingsControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudioencodersettingscontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioFormat new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioFormat
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioFormat 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioFormat 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudioformat.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioInput new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioInput
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioInput 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioInput 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudioinput.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioInputSelectorControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioInputSelectorControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioInputSelectorControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioInputSelectorControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudioinputselectorcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioOutput new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioOutput
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioOutput 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioOutput 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudiooutput.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioOutputSelectorControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioOutputSelectorControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioOutputSelectorControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioOutputSelectorControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudiooutputselectorcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioProbe new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioProbe
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioProbe 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioProbe 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudioprobe.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioRecorder new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioRecorder
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioRecorder 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioRecorder 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudiorecorder.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioSystemFactoryInterface new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioSystemFactoryInterface
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioSystemFactoryInterface 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioSystemFactoryInterface 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudiosystemplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioSystemPlugin new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioSystemPlugin
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioSystemPlugin 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QAudioSystemPlugin 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qaudiosystemplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCamera new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCamera
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCamera 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCamera 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcamera.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraCaptureBufferFormatControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraCaptureBufferFormatControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraCaptureBufferFormatControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraCaptureBufferFormatControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcameracapturebufferformatcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraCaptureDestinationControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraCaptureDestinationControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraCaptureDestinationControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraCaptureDestinationControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcameracapturedestinationcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcameracontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraExposure new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraExposure
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraExposure 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraExposure 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcameraexposure.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraExposureControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraExposureControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraExposureControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraExposureControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcameraexposurecontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFeedbackControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFeedbackControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFeedbackControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFeedbackControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcamerafeedbackcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFlashControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFlashControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFlashControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFlashControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcameraflashcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocus new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocus
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocus 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocus 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcamerafocus.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocusControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocusControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocusControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocusControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcamerafocuscontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocusZone new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocusZone
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocusZone 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocusZone 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcamerafocus.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocusZoneList new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocusZoneList
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocusZoneList 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraFocusZoneList 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcamerafocus.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageCapture new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageCapture
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageCapture 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageCapture 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcameraimagecapture.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageCaptureControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageCaptureControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageCaptureControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageCaptureControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcameraimagecapturecontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageProcessing new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageProcessing
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageProcessing 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageProcessing 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcameraimageprocessing.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageProcessingControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageProcessingControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageProcessingControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraImageProcessingControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcameraimageprocessingcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraInfo new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraInfo
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraInfo 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraInfo 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcamerainfo.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraInfoControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraInfoControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraInfoControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraInfoControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcamerainfocontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraLocksControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraLocksControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraLocksControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraLocksControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcameralockscontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraViewfinderSettingsControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraViewfinderSettingsControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraViewfinderSettingsControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraViewfinderSettingsControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcameraviewfindersettingscontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraZoomControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraZoomControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraZoomControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QCameraZoomControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcamerazoomcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QImageEncoderControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QImageEncoderControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QImageEncoderControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QImageEncoderControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qimageencodercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QImageEncoderSettings new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QImageEncoderSettings
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QImageEncoderSettings 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QImageEncoderSettings 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaencodersettings.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaAudioProbeControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaAudioProbeControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaAudioProbeControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaAudioProbeControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaaudioprobecontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaAvailabilityControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaAvailabilityControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaAvailabilityControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaAvailabilityControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaavailabilitycontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaBindableInterface new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaBindableInterface
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaBindableInterface 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaBindableInterface 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediabindableinterface.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaContainerControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaContainerControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaContainerControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaContainerControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediacontainercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaContent new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaContent
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaContent 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaContent 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediacontent.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediacontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaGaplessPlaybackControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaGaplessPlaybackControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaGaplessPlaybackControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaGaplessPlaybackControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediagaplessplaybackcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaMetaData new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaMetaData
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaMetaData 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaMetaData 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediametadata.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaNetworkAccessControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaNetworkAccessControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaNetworkAccessControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaNetworkAccessControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmedianetworkaccesscontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaObject new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaObject
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaObject 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaObject 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaobject.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaPlayer new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaPlayer
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaPlayer 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaPlayer 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaplayer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaPlayerControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaPlayerControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaPlayerControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaPlayerControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaplayercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaPlaylist new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaPlaylist
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaPlaylist 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaPlaylist 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaplaylist.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaRecorder new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaRecorder
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaRecorder 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaRecorder 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediarecorder.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaRecorderControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaRecorderControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaRecorderControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaRecorderControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediarecordercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaResource new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaResource
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaResource 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaResource 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaresource.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaResourceList new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaResourceList
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaResourceList 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaResourceList 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaresource.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaService new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaService
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaService 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaService 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaservice.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceCameraInfoInterface new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceCameraInfoInterface
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceCameraInfoInterface 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceCameraInfoInterface 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaserviceproviderplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceDefaultDeviceInterface new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceDefaultDeviceInterface
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceDefaultDeviceInterface 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceDefaultDeviceInterface 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaserviceproviderplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceFeaturesInterface new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceFeaturesInterface
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceFeaturesInterface 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceFeaturesInterface 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaserviceproviderplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceProviderFactoryInterface new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceProviderFactoryInterface
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceProviderFactoryInterface 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceProviderFactoryInterface 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaserviceproviderplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceProviderHint new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceProviderHint
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceProviderHint 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceProviderHint 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaserviceproviderplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceProviderPlugin new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceProviderPlugin
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceProviderPlugin 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceProviderPlugin 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaserviceproviderplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceSupportedDevicesInterface new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceSupportedDevicesInterface
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceSupportedDevicesInterface 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceSupportedDevicesInterface 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaserviceproviderplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceSupportedFormatsInterface new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceSupportedFormatsInterface
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceSupportedFormatsInterface 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaServiceSupportedFormatsInterface 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaserviceproviderplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaStreamsControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaStreamsControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaStreamsControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaStreamsControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediastreamscontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaTimeInterval new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaTimeInterval
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaTimeInterval 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaTimeInterval 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediatimerange.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaTimeRange new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaTimeRange
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaTimeRange 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaTimeRange 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediatimerange.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaVideoProbeControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaVideoProbeControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaVideoProbeControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMediaVideoProbeControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediavideoprobecontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMetaDataReaderControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMetaDataReaderControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMetaDataReaderControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMetaDataReaderControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmetadatareadercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMetaDataWriterControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMetaDataWriterControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMetaDataWriterControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMetaDataWriterControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmetadatawritercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMultimedia new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMultimedia
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMultimedia 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QMultimedia 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmultimedia.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioData new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioData
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioData 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioData 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qradiodata.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioDataControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioDataControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioDataControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioDataControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qradiodatacontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioTuner new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioTuner
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioTuner 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioTuner 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qradiotuner.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioTunerControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioTunerControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioTunerControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QRadioTunerControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qradiotunercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QSound new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QSound
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QSound 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QSound 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qsound.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QSoundEffect new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QSoundEffect
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QSoundEffect 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QSoundEffect 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qsoundeffect.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoDeviceSelectorControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoDeviceSelectorControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoDeviceSelectorControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoDeviceSelectorControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qvideodeviceselectorcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoEncoderSettings new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoEncoderSettings
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoEncoderSettings 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoEncoderSettings 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qmediaencodersettings.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoEncoderSettingsControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoEncoderSettingsControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoEncoderSettingsControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoEncoderSettingsControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qvideoencodersettingscontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoFrame new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoFrame
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoFrame 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoFrame 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qvideoframe.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoProbe new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoProbe
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoProbe 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoProbe 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qvideoprobe.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoRendererControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoRendererControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoRendererControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoRendererControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qvideorenderercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoSurfaceFormat new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoSurfaceFormat
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoSurfaceFormat 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoSurfaceFormat 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qvideosurfaceformat.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoWindowControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoWindowControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoWindowControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QVideoWindowControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qvideowindowcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QtMultimedia new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QtMultimedia
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QtMultimedia 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QtMultimedia 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1,82 @@
+#ifndef QT_QTMULTIMEDIA_MODULE_H
+#define QT_QTMULTIMEDIA_MODULE_H
+#include <QtMultimedia/QtMultimediaDepends>
+#include "qmediabindableinterface.h"
+#include "qmediacontrol.h"
+#include "qmediaenumdebug.h"
+#include "qmediametadata.h"
+#include "qmediaobject.h"
+#include "qmediaservice.h"
+#include "qmediaserviceproviderplugin.h"
+#include "qmediatimerange.h"
+#include "qmultimedia.h"
+#include "qtmultimediadefs.h"
+#include "qaudio.h"
+#include "qaudiobuffer.h"
+#include "qaudiodecoder.h"
+#include "qaudiodeviceinfo.h"
+#include "qaudioformat.h"
+#include "qaudioinput.h"
+#include "qaudiooutput.h"
+#include "qaudioprobe.h"
+#include "qaudiosystem.h"
+#include "qaudiosystemplugin.h"
+#include "qsound.h"
+#include "qsoundeffect.h"
+#include "qcamera.h"
+#include "qcameraexposure.h"
+#include "qcamerafocus.h"
+#include "qcameraimagecapture.h"
+#include "qcameraimageprocessing.h"
+#include "qcamerainfo.h"
+#include "qaudiodecodercontrol.h"
+#include "qaudioencodersettingscontrol.h"
+#include "qaudioinputselectorcontrol.h"
+#include "qaudiooutputselectorcontrol.h"
+#include "qcameracapturebufferformatcontrol.h"
+#include "qcameracapturedestinationcontrol.h"
+#include "qcameracontrol.h"
+#include "qcameraexposurecontrol.h"
+#include "qcamerafeedbackcontrol.h"
+#include "qcameraflashcontrol.h"
+#include "qcamerafocuscontrol.h"
+#include "qcameraimagecapturecontrol.h"
+#include "qcameraimageprocessingcontrol.h"
+#include "qcamerainfocontrol.h"
+#include "qcameralockscontrol.h"
+#include "qcameraviewfindersettingscontrol.h"
+#include "qcamerazoomcontrol.h"
+#include "qimageencodercontrol.h"
+#include "qmediaaudioprobecontrol.h"
+#include "qmediaavailabilitycontrol.h"
+#include "qmediacontainercontrol.h"
+#include "qmediagaplessplaybackcontrol.h"
+#include "qmedianetworkaccesscontrol.h"
+#include "qmediaplayercontrol.h"
+#include "qmediarecordercontrol.h"
+#include "qmediastreamscontrol.h"
+#include "qmediavideoprobecontrol.h"
+#include "qmetadatareadercontrol.h"
+#include "qmetadatawritercontrol.h"
+#include "qradiodatacontrol.h"
+#include "qradiotunercontrol.h"
+#include "qvideodeviceselectorcontrol.h"
+#include "qvideoencodersettingscontrol.h"
+#include "qvideorenderercontrol.h"
+#include "qvideowindowcontrol.h"
+#include "qmediacontent.h"
+#include "qmediaplayer.h"
+#include "qmediaplaylist.h"
+#include "qmediaresource.h"
+#include "qradiodata.h"
+#include "qradiotuner.h"
+#include "qaudiorecorder.h"
+#include "qmediaencodersettings.h"
+#include "qmediarecorder.h"
+#include "qabstractvideobuffer.h"
+#include "qabstractvideosurface.h"
+#include "qvideoframe.h"
+#include "qvideoprobe.h"
+#include "qvideosurfaceformat.h"
+#include "qtmultimediaversion.h"
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QtMultimediaVersion new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QtMultimediaVersion
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QtMultimediaVersion 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/QtMultimediaVersion 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qtmultimediaversion.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/headers.pri new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/headers.pri
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/headers.pri 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/headers.pri 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1,5 @@
+SYNCQT.HEADER_FILES = qmediabindableinterface.h qmediacontrol.h qmediaenumdebug.h qmediametadata.h qmediaobject.h qmediaservice.h qmediaserviceproviderplugin.h qmediatimerange.h qmultimedia.h qtmultimediadefs.h audio/qaudio.h audio/qaudiobuffer.h audio/qaudiodecoder.h audio/qaudiodeviceinfo.h audio/qaudioformat.h audio/qaudioinput.h audio/qaudiooutput.h audio/qaudioprobe.h audio/qaudiosystem.h audio/qaudiosystemplugin.h audio/qsound.h audio/qsoundeffect.h camera/qcamera.h camera/qcameraexposure.h camera/qcamerafocus.h camera/qcameraimagecapture.h camera/qcameraimageprocessing.h camera/qcamerainfo.h controls/qaudiodecodercontrol.h controls/qaudioencodersettingscontrol.h controls/qaudioinputselectorcontrol.h controls/qaudiooutputselectorcontrol.h controls/qcameracapturebufferformatcontrol.h controls/qcameracapturedestinationcontrol.h controls/qcameracontrol.h controls/qcameraexposurecontrol.h controls/qcamerafeedbackcontrol.h controls/qcameraflashcontrol.h controls/qcamerafocuscontrol.h controls/qcameraimagecapturecontrol.h controls/qcameraimageprocessingcontrol.h controls/qcamerainfocontrol.h controls/qcameralockscontrol.h controls/qcameraviewfindersettingscontrol.h controls/qcamerazoomcontrol.h controls/qimageencodercontrol.h controls/qmediaaudioprobecontrol.h controls/qmediaavailabilitycontrol.h controls/qmediacontainercontrol.h controls/qmediagaplessplaybackcontrol.h controls/qmedianetworkaccesscontrol.h controls/qmediaplayercontrol.h controls/qmediarecordercontrol.h controls/qmediastreamscontrol.h controls/qmediavideoprobecontrol.h controls/qmetadatareadercontrol.h controls/qmetadatawritercontrol.h controls/qradiodatacontrol.h controls/qradiotunercontrol.h controls/qvideodeviceselectorcontrol.h controls/qvideoencodersettingscontrol.h controls/qvideorenderercontrol.h controls/qvideowindowcontrol.h playback/qmediacontent.h playback/qmediaplayer.h playback/qmediaplaylist.h playback/qmediaresource.h radio/qradiodata.h radio/qradiotuner.h recording/qaudiorecorder.h recording/qmediaencodersettings.h recording/qmediarecorder.h video/qabstractvideobuffer.h video/qabstractvideosurface.h video/qvideoframe.h video/qvideoprobe.h video/qvideosurfaceformat.h ../../include/QtMultimedia/qtmultimediaversion.h ../../include/QtMultimedia/QtMultimedia
+SYNCQT.HEADER_CLASSES = ../../include/QtMultimedia/QMediaBindableInterface ../../include/QtMultimedia/QMediaControl ../../include/QtMultimedia/QMediaMetaData ../../include/QtMultimedia/QMediaObject ../../include/QtMultimedia/QMediaService ../../include/QtMultimedia/QMediaServiceProviderHint ../../include/QtMultimedia/QMediaServiceProviderFactoryInterface ../../include/QtMultimedia/QMediaServiceSupportedFormatsInterface ../../include/QtMultimedia/QMediaServiceSupportedDevicesInterface ../../include/QtMultimedia/QMediaServiceDefaultDeviceInterface ../../include/QtMultimedia/QMediaServiceCameraInfoInterface ../../include/QtMultimedia/QMediaServiceFeaturesInterface ../../include/QtMultimedia/QMediaServiceProviderPlugin ../../include/QtMultimedia/QMediaTimeInterval ../../include/QtMultimedia/QMediaTimeRange ../../include/QtMultimedia/QMultimedia ../../include/QtMultimedia/QAudio ../../include/QtMultimedia/QAudioBuffer ../../include/QtMultimedia/QAudioDecoder ../../include/QtMultimedia/QAudioDeviceInfo ../../include/QtMultimedia/QAudioFormat ../../include/QtMultimedia/QAudioInput ../../include/QtMultimedia/QAudioOutput ../../include/QtMultimedia/QAudioProbe ../../include/QtMultimedia/QAbstractAudioDeviceInfo ../../include/QtMultimedia/QAbstractAudioOutput ../../include/QtMultimedia/QAbstractAudioInput ../../include/QtMultimedia/QAudioSystemFactoryInterface ../../include/QtMultimedia/QAudioSystemPlugin ../../include/QtMultimedia/QSound ../../include/QtMultimedia/QSoundEffect ../../include/QtMultimedia/QCamera ../../include/QtMultimedia/QCameraExposure ../../include/QtMultimedia/QCameraFocusZone ../../include/QtMultimedia/QCameraFocusZoneList ../../include/QtMultimedia/QCameraFocus ../../include/QtMultimedia/QCameraImageCapture ../../include/QtMultimedia/QCameraImageProcessing ../../include/QtMultimedia/QCameraInfo ../../include/QtMultimedia/QAudioDecoderControl ../../include/QtMultimedia/QAudioEncoderSettingsControl ../../include/QtMultimedia/QAudioInputSelectorControl ../../include/QtMultimedia/QAudioOutputSelectorControl ../../include/QtMultimedia/QCameraCaptureBufferFormatControl ../../include/QtMultimedia/QCameraCaptureDestinationControl ../../include/QtMultimedia/QCameraControl ../../include/QtMultimedia/QCameraExposureControl ../../include/QtMultimedia/QCameraFeedbackControl ../../include/QtMultimedia/QCameraFlashControl ../../include/QtMultimedia/QCameraFocusControl ../../include/QtMultimedia/QCameraImageCaptureControl ../../include/QtMultimedia/QCameraImageProcessingControl ../../include/QtMultimedia/QCameraInfoControl ../../include/QtMultimedia/QCameraLocksControl ../../include/QtMultimedia/QCameraViewfinderSettingsControl ../../include/QtMultimedia/QCameraZoomControl ../../include/QtMultimedia/QImageEncoderControl ../../include/QtMultimedia/QMediaAudioProbeControl ../../include/QtMultimedia/QMediaAvailabilityControl ../../include/QtMultimedia/QMediaContainerControl ../../include/QtMultimedia/QMediaGaplessPlaybackControl ../../include/QtMultimedia/QMediaNetworkAccessControl ../../include/QtMultimedia/QMediaPlayerControl ../../include/QtMultimedia/QMediaRecorderControl ../../include/QtMultimedia/QMediaStreamsControl ../../include/QtMultimedia/QMediaVideoProbeControl ../../include/QtMultimedia/QMetaDataReaderControl ../../include/QtMultimedia/QMetaDataWriterControl ../../include/QtMultimedia/QRadioDataControl ../../include/QtMultimedia/QRadioTunerControl ../../include/QtMultimedia/QVideoDeviceSelectorControl ../../include/QtMultimedia/QVideoEncoderSettingsControl ../../include/QtMultimedia/QVideoRendererControl ../../include/QtMultimedia/QVideoWindowControl ../../include/QtMultimedia/QMediaContent ../../include/QtMultimedia/QMediaPlayer ../../include/QtMultimedia/QMediaPlaylist ../../include/QtMultimedia/QMediaResource ../../include/QtMultimedia/QMediaResourceList ../../include/QtMultimedia/QRadioData ../../include/QtMultimedia/QRadioTuner ../../include/QtMultimedia/QAudioRecorder ../../include/QtMultimedia/QAudioEncoderSettings ../../include/QtMultimedia/QVideoEncoderSettings ../../include/QtMultimedia/QImageEncoderSettings ../../include/QtMultimedia/QMediaRecorder ../../include/QtMultimedia/QAbstractVideoBuffer ../../include/QtMultimedia/QAbstractVideoSurface ../../include/QtMultimedia/QVideoFrame ../../include/QtMultimedia/QVideoProbe ../../include/QtMultimedia/QVideoSurfaceFormat ../../include/QtMultimedia/QtMultimediaVersion
+SYNCQT.PRIVATE_HEADER_FILES = qmediacontrol_p.h qmediaobject_p.h qmediapluginloader_p.h qmediaresourcepolicy_p.h qmediaresourcepolicyplugin_p.h qmediaresourceset_p.h qmediaservice_p.h qmediaserviceprovider_p.h qmediastoragelocation_p.h audio/qaudiobuffer_p.h audio/qaudiodevicefactory_p.h audio/qaudiohelpers_p.h audio/qsamplecache_p.h audio/qsoundeffect_pulse_p.h audio/qsoundeffect_qaudio_p.h audio/qwavedecoder_p.h camera/qcamera_p.h controls/qmediaplaylistcontrol_p.h controls/qmediaplaylistsourcecontrol_p.h gsttools_headers/gstvideoconnector_p.h gsttools_headers/qgstappsrc_p.h gsttools_headers/qgstbufferpoolinterface_p.h gsttools_headers/qgstcodecsinfo_p.h gsttools_headers/qgstreameraudioinputselector_p.h gsttools_headers/qgstreameraudioprobecontrol_p.h gsttools_headers/qgstreamerbushelper_p.h gsttools_headers/qgstreamergltexturerenderer_p.h gsttools_headers/qgstreamermessage_p.h gsttools_headers/qgstreamervideoinputdevicecontrol_p.h gsttools_headers/qgstreamervideoprobecontrol_p.h gsttools_headers/qgstreamervideorenderer_p.h gsttools_headers/qgstreamervideorendererinterface_p.h gsttools_headers/qgstreamervideowidget_p.h gsttools_headers/qgstreamervideowindow_p.h gsttools_headers/qgstutils_p.h gsttools_headers/qgstvideobuffer_p.h gsttools_headers/qvideosurfacegstsink_p.h playback/playlistfileparser_p.h playback/qmedianetworkplaylistprovider_p.h playback/qmediaplaylist_p.h playback/qmediaplaylistioplugin_p.h playback/qmediaplaylistnavigator_p.h playback/qmediaplaylistprovider_p.h qtmultimediaquicktools_headers/qdeclarativevideooutput_backend_p.h qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h qtmultimediaquicktools_headers/qsgvideonode_p.h qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h recording/qmediarecorder_p.h video/qabstractvideobuffer_p.h video/qimagevideobuffer_p.h video/qmemoryvideobuffer_p.h video/qvideooutputorientationhandler_p.h video/qvideosurfaceoutput_p.h
+SYNCQT.QPA_HEADER_FILES =
+SYNCQT.INJECTIONS =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qabstractvideobuffer.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qabstractvideobuffer.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qabstractvideobuffer.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qabstractvideobuffer.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/video/qabstractvideobuffer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qabstractvideosurface.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qabstractvideosurface.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qabstractvideosurface.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qabstractvideosurface.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/video/qabstractvideosurface.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudio.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudio.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudio.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudio.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/audio/qaudio.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiobuffer.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiobuffer.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiobuffer.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiobuffer.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/audio/qaudiobuffer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiodecoder.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiodecoder.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiodecoder.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiodecoder.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/audio/qaudiodecoder.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiodecodercontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiodecodercontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiodecodercontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiodecodercontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qaudiodecodercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiodeviceinfo.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiodeviceinfo.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiodeviceinfo.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiodeviceinfo.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/audio/qaudiodeviceinfo.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioencodersettingscontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioencodersettingscontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioencodersettingscontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioencodersettingscontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qaudioencodersettingscontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioformat.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioformat.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioformat.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioformat.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/audio/qaudioformat.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioinput.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioinput.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioinput.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioinput.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/audio/qaudioinput.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioinputselectorcontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioinputselectorcontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioinputselectorcontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioinputselectorcontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qaudioinputselectorcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiooutput.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiooutput.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiooutput.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiooutput.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/audio/qaudiooutput.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiooutputselectorcontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiooutputselectorcontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiooutputselectorcontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiooutputselectorcontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qaudiooutputselectorcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioprobe.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioprobe.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioprobe.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudioprobe.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/audio/qaudioprobe.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiorecorder.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiorecorder.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiorecorder.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiorecorder.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/recording/qaudiorecorder.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiosystem.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiosystem.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiosystem.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiosystem.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/audio/qaudiosystem.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiosystemplugin.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiosystemplugin.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiosystemplugin.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qaudiosystemplugin.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/audio/qaudiosystemplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamera.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamera.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamera.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamera.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/camera/qcamera.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameracapturebufferformatcontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameracapturebufferformatcontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameracapturebufferformatcontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameracapturebufferformatcontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qcameracapturebufferformatcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameracapturedestinationcontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameracapturedestinationcontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameracapturedestinationcontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameracapturedestinationcontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qcameracapturedestinationcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameracontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameracontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameracontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameracontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qcameracontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraexposure.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraexposure.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraexposure.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraexposure.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/camera/qcameraexposure.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraexposurecontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraexposurecontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraexposurecontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraexposurecontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qcameraexposurecontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerafeedbackcontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerafeedbackcontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerafeedbackcontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerafeedbackcontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qcamerafeedbackcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraflashcontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraflashcontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraflashcontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraflashcontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qcameraflashcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerafocus.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerafocus.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerafocus.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerafocus.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/camera/qcamerafocus.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerafocuscontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerafocuscontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerafocuscontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerafocuscontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qcamerafocuscontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimagecapture.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimagecapture.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimagecapture.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimagecapture.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/camera/qcameraimagecapture.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimagecapturecontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimagecapturecontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimagecapturecontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimagecapturecontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qcameraimagecapturecontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimageprocessing.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimageprocessing.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimageprocessing.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimageprocessing.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/camera/qcameraimageprocessing.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimageprocessingcontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimageprocessingcontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimageprocessingcontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraimageprocessingcontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qcameraimageprocessingcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerainfo.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerainfo.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerainfo.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerainfo.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/camera/qcamerainfo.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerainfocontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerainfocontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerainfocontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerainfocontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qcamerainfocontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameralockscontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameralockscontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameralockscontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameralockscontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qcameralockscontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraviewfindersettingscontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraviewfindersettingscontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraviewfindersettingscontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcameraviewfindersettingscontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qcameraviewfindersettingscontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerazoomcontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerazoomcontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerazoomcontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qcamerazoomcontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qcamerazoomcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qimageencodercontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qimageencodercontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qimageencodercontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qimageencodercontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qimageencodercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaaudioprobecontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaaudioprobecontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaaudioprobecontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaaudioprobecontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qmediaaudioprobecontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaavailabilitycontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaavailabilitycontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaavailabilitycontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaavailabilitycontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qmediaavailabilitycontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediabindableinterface.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediabindableinterface.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediabindableinterface.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediabindableinterface.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/qmediabindableinterface.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediacontainercontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediacontainercontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediacontainercontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediacontainercontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qmediacontainercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediacontent.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediacontent.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediacontent.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediacontent.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/playback/qmediacontent.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediacontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediacontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediacontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediacontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/qmediacontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaencodersettings.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaencodersettings.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaencodersettings.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaencodersettings.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/recording/qmediaencodersettings.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaenumdebug.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaenumdebug.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaenumdebug.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaenumdebug.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/qmediaenumdebug.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediagaplessplaybackcontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediagaplessplaybackcontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediagaplessplaybackcontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediagaplessplaybackcontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qmediagaplessplaybackcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediametadata.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediametadata.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediametadata.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediametadata.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/qmediametadata.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmedianetworkaccesscontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmedianetworkaccesscontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmedianetworkaccesscontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmedianetworkaccesscontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qmedianetworkaccesscontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaobject.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaobject.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaobject.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaobject.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/qmediaobject.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaplayer.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaplayer.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaplayer.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaplayer.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/playback/qmediaplayer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaplayercontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaplayercontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaplayercontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaplayercontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qmediaplayercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaplaylist.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaplaylist.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaplaylist.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaplaylist.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/playback/qmediaplaylist.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediarecorder.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediarecorder.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediarecorder.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediarecorder.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/recording/qmediarecorder.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediarecordercontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediarecordercontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediarecordercontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediarecordercontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qmediarecordercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaresource.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaresource.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaresource.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaresource.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/playback/qmediaresource.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaservice.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaservice.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaservice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaservice.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/qmediaservice.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaserviceproviderplugin.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaserviceproviderplugin.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaserviceproviderplugin.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediaserviceproviderplugin.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/qmediaserviceproviderplugin.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediastreamscontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediastreamscontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediastreamscontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediastreamscontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qmediastreamscontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediatimerange.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediatimerange.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediatimerange.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediatimerange.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/qmediatimerange.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediavideoprobecontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediavideoprobecontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediavideoprobecontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmediavideoprobecontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qmediavideoprobecontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmetadatareadercontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmetadatareadercontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmetadatareadercontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmetadatareadercontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qmetadatareadercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmetadatawritercontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmetadatawritercontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmetadatawritercontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmetadatawritercontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qmetadatawritercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmultimedia.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmultimedia.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmultimedia.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qmultimedia.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/qmultimedia.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiodata.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiodata.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiodata.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiodata.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/radio/qradiodata.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiodatacontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiodatacontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiodatacontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiodatacontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qradiodatacontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiotuner.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiotuner.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiotuner.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiotuner.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/radio/qradiotuner.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiotunercontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiotunercontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiotunercontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qradiotunercontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qradiotunercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qsound.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qsound.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qsound.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qsound.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/audio/qsound.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qsoundeffect.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qsoundeffect.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qsoundeffect.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qsoundeffect.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/audio/qsoundeffect.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qtmultimediadefs.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qtmultimediadefs.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qtmultimediadefs.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qtmultimediadefs.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/qtmultimediadefs.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qtmultimediaversion.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qtmultimediaversion.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qtmultimediaversion.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qtmultimediaversion.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1,9 @@
+/* This file was generated by syncqt. */
+#ifndef QT_QTMULTIMEDIA_VERSION_H
+#define QT_QTMULTIMEDIA_VERSION_H
+
+#define QTMULTIMEDIA_VERSION_STR "5.3.2"
+
+#define QTMULTIMEDIA_VERSION 0x050302
+
+#endif // QT_QTMULTIMEDIA_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideodeviceselectorcontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideodeviceselectorcontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideodeviceselectorcontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideodeviceselectorcontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qvideodeviceselectorcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideoencodersettingscontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideoencodersettingscontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideoencodersettingscontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideoencodersettingscontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qvideoencodersettingscontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideoframe.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideoframe.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideoframe.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideoframe.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/video/qvideoframe.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideoprobe.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideoprobe.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideoprobe.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideoprobe.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/video/qvideoprobe.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideorenderercontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideorenderercontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideorenderercontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideorenderercontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qvideorenderercontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideosurfaceformat.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideosurfaceformat.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideosurfaceformat.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideosurfaceformat.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/video/qvideosurfaceformat.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideowindowcontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideowindowcontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideowindowcontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimedia/qvideowindowcontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimedia/controls/qvideowindowcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/5.3.2/QtMultimediaQuick_p/private/qdeclarativevideooutput_render_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/5.3.2/QtMultimediaQuick_p/private/qdeclarativevideooutput_render_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/5.3.2/QtMultimediaQuick_p/private/qdeclarativevideooutput_render_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/5.3.2/QtMultimediaQuick_p/private/qdeclarativevideooutput_render_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/5.3.2/QtMultimediaQuick_p/private/qdeclarativevideooutput_window_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/5.3.2/QtMultimediaQuick_p/private/qdeclarativevideooutput_window_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/5.3.2/QtMultimediaQuick_p/private/qdeclarativevideooutput_window_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/5.3.2/QtMultimediaQuick_p/private/qdeclarativevideooutput_window_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNodeFactory_I420 new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNodeFactory_I420
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNodeFactory_I420 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNodeFactory_I420 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qsgvideonode_i420.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNodeFactory_RGB new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNodeFactory_RGB
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNodeFactory_RGB 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNodeFactory_RGB 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qsgvideonode_rgb.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNodeFactory_Texture new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNodeFactory_Texture
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNodeFactory_Texture 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNodeFactory_Texture 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qsgvideonode_texture.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNode_I420 new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNode_I420
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNode_I420 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNode_I420 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qsgvideonode_i420.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNode_RGB new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNode_RGB
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNode_RGB 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNode_RGB 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qsgvideonode_rgb.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNode_Texture new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNode_Texture
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNode_Texture 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QSGVideoNode_Texture 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qsgvideonode_texture.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QtMultimediaQuick_p new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QtMultimediaQuick_p
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QtMultimediaQuick_p 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QtMultimediaQuick_p 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1,5 @@
+#ifndef QT_QTMULTIMEDIAQUICK_P_MODULE_H
+#define QT_QTMULTIMEDIAQUICK_P_MODULE_H
+#include <QtMultimediaQuick_p/QtMultimediaQuick_pDepends>
+#include "qtmultimediaquick_pversion.h"
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QtMultimediaQuick_pVersion new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QtMultimediaQuick_pVersion
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QtMultimediaQuick_pVersion 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/QtMultimediaQuick_pVersion 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qtmultimediaquick_pversion.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/headers.pri new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/headers.pri
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/headers.pri 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/headers.pri 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1,5 @@
+SYNCQT.HEADER_FILES = qsgvideonode_i420.h qsgvideonode_rgb.h qsgvideonode_texture.h ../../include/QtMultimediaQuick_p/qtmultimediaquick_pversion.h ../../include/QtMultimediaQuick_p/QtMultimediaQuick_p
+SYNCQT.HEADER_CLASSES = ../../include/QtMultimediaQuick_p/QSGVideoNode_I420 ../../include/QtMultimediaQuick_p/QSGVideoNodeFactory_I420 ../../include/QtMultimediaQuick_p/QSGVideoNode_RGB ../../include/QtMultimediaQuick_p/QSGVideoNodeFactory_RGB ../../include/QtMultimediaQuick_p/QSGVideoNode_Texture ../../include/QtMultimediaQuick_p/QSGVideoNodeFactory_Texture ../../include/QtMultimediaQuick_p/QtMultimediaQuick_pVersion
+SYNCQT.PRIVATE_HEADER_FILES = qdeclarativevideooutput_render_p.h qdeclarativevideooutput_window_p.h
+SYNCQT.QPA_HEADER_FILES =
+SYNCQT.INJECTIONS =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qsgvideonode_i420.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qsgvideonode_i420.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qsgvideonode_i420.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qsgvideonode_i420.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/qtmultimediaquicktools/qsgvideonode_i420.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qsgvideonode_rgb.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qsgvideonode_rgb.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qsgvideonode_rgb.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qsgvideonode_rgb.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/qtmultimediaquicktools/qsgvideonode_rgb.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qsgvideonode_texture.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qsgvideonode_texture.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qsgvideonode_texture.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qsgvideonode_texture.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/qtmultimediaquicktools/qsgvideonode_texture.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qtmultimediaquick_pversion.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qtmultimediaquick_pversion.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qtmultimediaquick_pversion.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaQuick_p/qtmultimediaquick_pversion.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1,9 @@
+/* This file was generated by syncqt. */
+#ifndef QT_QTMULTIMEDIAQUICK_P_VERSION_H
+#define QT_QTMULTIMEDIAQUICK_P_VERSION_H
+
+#define QTMULTIMEDIAQUICK_P_VERSION_STR "5.3.2"
+
+#define QTMULTIMEDIAQUICK_P_VERSION 0x050302
+
+#endif // QT_QTMULTIMEDIAQUICK_P_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/5.3.2/QtMultimediaWidgets/private/qeglimagetexturesurface_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/5.3.2/QtMultimediaWidgets/private/qeglimagetexturesurface_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/5.3.2/QtMultimediaWidgets/private/qeglimagetexturesurface_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/5.3.2/QtMultimediaWidgets/private/qeglimagetexturesurface_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimediawidgets/qeglimagetexturesurface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/5.3.2/QtMultimediaWidgets/private/qpaintervideosurface_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/5.3.2/QtMultimediaWidgets/private/qpaintervideosurface_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/5.3.2/QtMultimediaWidgets/private/qpaintervideosurface_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/5.3.2/QtMultimediaWidgets/private/qpaintervideosurface_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimediawidgets/qpaintervideosurface_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/5.3.2/QtMultimediaWidgets/private/qvideowidget_p.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/5.3.2/QtMultimediaWidgets/private/qvideowidget_p.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/5.3.2/QtMultimediaWidgets/private/qvideowidget_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/5.3.2/QtMultimediaWidgets/private/qvideowidget_p.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/multimediawidgets/qvideowidget_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QCameraViewfinder new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QCameraViewfinder
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QCameraViewfinder 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QCameraViewfinder 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qcameraviewfinder.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QGraphicsVideoItem new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QGraphicsVideoItem
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QGraphicsVideoItem 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QGraphicsVideoItem 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qgraphicsvideoitem.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QVideoWidget new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QVideoWidget
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QVideoWidget 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QVideoWidget 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qvideowidget.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QVideoWidgetControl new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QVideoWidgetControl
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QVideoWidgetControl 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QVideoWidgetControl 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qvideowidgetcontrol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QtMultimediaWidgets new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QtMultimediaWidgets
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QtMultimediaWidgets 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QtMultimediaWidgets 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1,10 @@
+#ifndef QT_QTMULTIMEDIAWIDGETS_MODULE_H
+#define QT_QTMULTIMEDIAWIDGETS_MODULE_H
+#include <QtMultimediaWidgets/QtMultimediaWidgetsDepends>
+#include "qcameraviewfinder.h"
+#include "qgraphicsvideoitem.h"
+#include "qtmultimediawidgetdefs.h"
+#include "qvideowidget.h"
+#include "qvideowidgetcontrol.h"
+#include "qtmultimediawidgetsversion.h"
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QtMultimediaWidgetsVersion new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QtMultimediaWidgetsVersion
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QtMultimediaWidgetsVersion 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/QtMultimediaWidgetsVersion 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "qtmultimediawidgetsversion.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/headers.pri new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/headers.pri
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/headers.pri 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/headers.pri 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1,5 @@
+SYNCQT.HEADER_FILES = qcameraviewfinder.h qgraphicsvideoitem.h qtmultimediawidgetdefs.h qvideowidget.h qvideowidgetcontrol.h ../../include/QtMultimediaWidgets/qtmultimediawidgetsversion.h ../../include/QtMultimediaWidgets/QtMultimediaWidgets
+SYNCQT.HEADER_CLASSES = ../../include/QtMultimediaWidgets/QCameraViewfinder ../../include/QtMultimediaWidgets/QGraphicsVideoItem ../../include/QtMultimediaWidgets/QVideoWidget ../../include/QtMultimediaWidgets/QVideoWidgetControl ../../include/QtMultimediaWidgets/QtMultimediaWidgetsVersion
+SYNCQT.PRIVATE_HEADER_FILES = qeglimagetexturesurface_p.h qpaintervideosurface_p.h qvideowidget_p.h
+SYNCQT.QPA_HEADER_FILES =
+SYNCQT.INJECTIONS =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qcameraviewfinder.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qcameraviewfinder.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qcameraviewfinder.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qcameraviewfinder.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimediawidgets/qcameraviewfinder.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qgraphicsvideoitem.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qgraphicsvideoitem.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qgraphicsvideoitem.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qgraphicsvideoitem.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimediawidgets/qgraphicsvideoitem.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qtmultimediawidgetdefs.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qtmultimediawidgetdefs.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qtmultimediawidgetdefs.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qtmultimediawidgetdefs.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimediawidgets/qtmultimediawidgetdefs.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qtmultimediawidgetsversion.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qtmultimediawidgetsversion.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qtmultimediawidgetsversion.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qtmultimediawidgetsversion.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1,9 @@
+/* This file was generated by syncqt. */
+#ifndef QT_QTMULTIMEDIAWIDGETS_VERSION_H
+#define QT_QTMULTIMEDIAWIDGETS_VERSION_H
+
+#define QTMULTIMEDIAWIDGETS_VERSION_STR "5.3.2"
+
+#define QTMULTIMEDIAWIDGETS_VERSION 0x050302
+
+#endif // QT_QTMULTIMEDIAWIDGETS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qvideowidget.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qvideowidget.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qvideowidget.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qvideowidget.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimediawidgets/qvideowidget.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qvideowidgetcontrol.h new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qvideowidgetcontrol.h
--- old/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qvideowidgetcontrol.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtmultimedia-opensource-src-5.3.2/include/QtMultimediaWidgets/qvideowidgetcontrol.h 2014-09-11 12:48:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/multimediawidgets/qvideowidgetcontrol.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-qtlocation for openSUSE:Factory checked in at 2014-09-18 07:56:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-09-08 21:28:38.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtlocation.new/libqt5-qtlocation.changes 2014-09-18 07:56:47.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 16 11:27:52 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2 final
+ * No changes since previous snapshot
+ * Use official tars
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtlocation.spec ++++++
--- /var/tmp/diff_new_pack.w1dOjQ/_old 2014-09-18 07:56:48.000000000 +0200
+++ /var/tmp/diff_new_pack.w1dOjQ/_new 2014-09-18 07:56:48.000000000 +0200
@@ -16,12 +16,12 @@
#
-%define qt5_snapshot 1
+%define qt5_snapshot 0
%define libname libQt5Positioning5
Name: libqt5-qtlocation
-Version: 5.3.2~git20140904
+Version: 5.3.2
Release: 0
Summary: Qt 5 Location Addon
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
++++++ qtlocation-opensource-src-5.3.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qcache3q_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qcache3q_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qcache3q_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qcache3q_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qcache3q_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocameracapabilities_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocameracapabilities_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocameracapabilities_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocameracapabilities_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeocameracapabilities_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocameradata_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocameradata_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocameradata_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocameradata_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeocameradata_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocameratiles_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocameratiles_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocameratiles_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocameratiles_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeocameratiles_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocodereply_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocodereply_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocodereply_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocodereply_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeocodereply_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocodingmanager_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocodingmanager_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocodingmanager_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocodingmanager_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeocodingmanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocodingmanagerengine_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocodingmanagerengine_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocodingmanagerengine_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeocodingmanagerengine_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeocodingmanagerengine_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomaneuver_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomaneuver_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomaneuver_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomaneuver_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeomaneuver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomap_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomap_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomap_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomap_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeomap_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapcontroller_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapcontroller_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapcontroller_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapcontroller_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeomapcontroller_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapdata_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapdata_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapdata_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapdata_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeomapdata_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapdata_p_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapdata_p_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapdata_p_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapdata_p_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeomapdata_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanager_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanager_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanager_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanager_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeomappingmanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanager_p_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanager_p_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanager_p_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanager_p_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeomappingmanager_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanagerengine_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanagerengine_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanagerengine_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanagerengine_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeomappingmanagerengine_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanagerengine_p_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanagerengine_p_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanagerengine_p_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomappingmanagerengine_p_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeomappingmanagerengine_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapscene_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapscene_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapscene_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomapscene_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeomapscene_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomaptype_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomaptype_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomaptype_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomaptype_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeomaptype_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomaptype_p_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomaptype_p_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomaptype_p_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeomaptype_p_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeomaptype_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroute_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroute_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroute_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroute_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeoroute_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutereply_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutereply_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutereply_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutereply_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeoroutereply_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeorouterequest_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeorouterequest_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeorouterequest_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeorouterequest_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeorouterequest_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutesegment_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutesegment_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutesegment_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutesegment_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeoroutesegment_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutingmanager_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutingmanager_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutingmanager_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutingmanager_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeoroutingmanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutingmanagerengine_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutingmanagerengine_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutingmanagerengine_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoroutingmanagerengine_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeoroutingmanagerengine_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoserviceprovider_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoserviceprovider_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoserviceprovider_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeoserviceprovider_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeoserviceprovider_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilecache_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilecache_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilecache_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilecache_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeotilecache_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapdata_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapdata_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapdata_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapdata_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeotiledmapdata_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapdata_p_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapdata_p_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapdata_p_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapdata_p_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeotiledmapdata_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmappingmanagerengine_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmappingmanagerengine_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmappingmanagerengine_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmappingmanagerengine_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeotiledmappingmanagerengine_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmappingmanagerengine_p_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmappingmanagerengine_p_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmappingmanagerengine_p_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmappingmanagerengine_p_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeotiledmappingmanagerengine_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapreply_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapreply_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapreply_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapreply_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeotiledmapreply_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapreply_p_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapreply_p_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapreply_p_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotiledmapreply_p_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeotiledmapreply_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilefetcher_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilefetcher_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilefetcher_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilefetcher_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeotilefetcher_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilefetcher_p_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilefetcher_p_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilefetcher_p_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilefetcher_p_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeotilefetcher_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilerequestmanager_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilerequestmanager_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilerequestmanager_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilerequestmanager_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeotilerequestmanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilespec_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilespec_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilespec_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilespec_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeotilespec_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilespec_p_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilespec_p_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilespec_p_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qgeotilespec_p_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/maps/qgeotilespec_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplace_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplace_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplace_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplace_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplace_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceattribute_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceattribute_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceattribute_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceattribute_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplaceattribute_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecategory_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecategory_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecategory_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecategory_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplacecategory_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecontactdetail_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecontactdetail_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecontactdetail_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecontactdetail_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplacecontactdetail_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecontent_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecontent_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecontent_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecontent_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplacecontent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecontentrequest_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecontentrequest_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecontentrequest_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacecontentrequest_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplacecontentrequest_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceeditorial_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceeditorial_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceeditorial_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceeditorial_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplaceeditorial_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceicon_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceicon_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceicon_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceicon_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplaceicon_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceimage_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceimage_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceimage_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceimage_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplaceimage_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacemanagerengine_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacemanagerengine_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacemanagerengine_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacemanagerengine_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplacemanagerengine_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceproposedsearchresult_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceproposedsearchresult_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceproposedsearchresult_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceproposedsearchresult_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplaceproposedsearchresult_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceratings_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceratings_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceratings_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceratings_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplaceratings_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacereply_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacereply_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacereply_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacereply_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplacereply_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceresult_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceresult_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceresult_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceresult_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplaceresult_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacereview_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacereview_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacereview_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacereview_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplacereview_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacesearchresult_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacesearchresult_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacesearchresult_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacesearchresult_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplacesearchresult_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacesupplier_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacesupplier_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacesupplier_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplacesupplier_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplacesupplier_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceuser_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceuser_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceuser_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/qplaceuser_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/qplaceuser_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/unsupportedreplies_p.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/unsupportedreplies_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/unsupportedreplies_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/5.3.2/QtLocation/private/unsupportedreplies_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/location/places/unsupportedreplies_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoCodeReply new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoCodeReply
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoCodeReply 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoCodeReply 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeocodereply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoCodingManager new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoCodingManager
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoCodingManager 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoCodingManager 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeocodingmanager.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoCodingManagerEngine new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoCodingManagerEngine
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoCodingManagerEngine 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoCodingManagerEngine 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeocodingmanagerengine.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoManeuver new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoManeuver
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoManeuver 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoManeuver 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeomaneuver.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRoute new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRoute
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRoute 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRoute 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeoroute.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRouteReply new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRouteReply
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRouteReply 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRouteReply 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeoroutereply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRouteRequest new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRouteRequest
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRouteRequest 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRouteRequest 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeorouterequest.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRouteSegment new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRouteSegment
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRouteSegment 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRouteSegment 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeoroutesegment.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRoutingManager new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRoutingManager
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRoutingManager 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRoutingManager 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeoroutingmanager.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRoutingManagerEngine new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRoutingManagerEngine
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRoutingManagerEngine 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoRoutingManagerEngine 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeoroutingmanagerengine.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoServiceProvider new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoServiceProvider
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoServiceProvider 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoServiceProvider 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeoserviceprovider.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoServiceProviderFactory new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoServiceProviderFactory
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoServiceProviderFactory 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QGeoServiceProviderFactory 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeoserviceproviderfactory.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QLocation new/qtlocation-opensource-src-5.3.2/include/QtLocation/QLocation
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QLocation 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QLocation 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qlocation.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlace new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlace
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlace 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlace 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplace.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceAttribute new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceAttribute
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceAttribute 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceAttribute 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplaceattribute.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceCategory new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceCategory
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceCategory 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceCategory 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacecategory.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContactDetail new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContactDetail
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContactDetail 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContactDetail 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacecontactdetail.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContent new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContent
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContent 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContent 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacecontent.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContentReply new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContentReply
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContentReply 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContentReply 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacecontentreply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContentRequest new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContentRequest
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContentRequest 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceContentRequest 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacecontentrequest.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceDetailsReply new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceDetailsReply
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceDetailsReply 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceDetailsReply 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacedetailsreply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceEditorial new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceEditorial
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceEditorial 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceEditorial 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplaceeditorial.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceIcon new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceIcon
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceIcon 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceIcon 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplaceicon.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceIdReply new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceIdReply
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceIdReply 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceIdReply 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplaceidreply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceImage new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceImage
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceImage 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceImage 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplaceimage.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceManager new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceManager
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceManager 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceManager 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacemanager.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceManagerEngine new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceManagerEngine
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceManagerEngine 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceManagerEngine 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacemanagerengine.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceMatchReply new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceMatchReply
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceMatchReply 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceMatchReply 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacematchreply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceMatchRequest new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceMatchRequest
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceMatchRequest 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceMatchRequest 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacematchrequest.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceProposedSearchResult new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceProposedSearchResult
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceProposedSearchResult 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceProposedSearchResult 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplaceproposedsearchresult.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceRatings new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceRatings
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceRatings 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceRatings 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplaceratings.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceReply new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceReply
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceReply 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceReply 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacereply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceResult new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceResult
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceResult 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceResult 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplaceresult.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceReview new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceReview
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceReview 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceReview 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacereview.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchReply new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchReply
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchReply 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchReply 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacesearchreply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchRequest new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchRequest
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchRequest 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchRequest 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacesearchrequest.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchResult new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchResult
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchResult 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchResult 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacesearchresult.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchSuggestionReply new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchSuggestionReply
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchSuggestionReply 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSearchSuggestionReply 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacesearchsuggestionreply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSupplier new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSupplier
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSupplier 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceSupplier 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplacesupplier.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceUser new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceUser
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceUser 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QPlaceUser 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qplaceuser.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QtLocation new/qtlocation-opensource-src-5.3.2/include/QtLocation/QtLocation
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QtLocation 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QtLocation 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1,47 @@
+#ifndef QT_QTLOCATION_MODULE_H
+#define QT_QTLOCATION_MODULE_H
+#include <QtLocation/QtLocationDepends>
+#include "qlocation.h"
+#include "qlocationglobal.h"
+#include "qgeocodereply.h"
+#include "qgeocodingmanager.h"
+#include "qgeocodingmanagerengine.h"
+#include "qgeomaneuver.h"
+#include "qgeoroute.h"
+#include "qgeoroutereply.h"
+#include "qgeorouterequest.h"
+#include "qgeoroutesegment.h"
+#include "qgeoroutingmanager.h"
+#include "qgeoroutingmanagerengine.h"
+#include "qgeoserviceprovider.h"
+#include "qgeoserviceproviderfactory.h"
+#include "placemacro.h"
+#include "qplace.h"
+#include "qplaceattribute.h"
+#include "qplacecategory.h"
+#include "qplacecontactdetail.h"
+#include "qplacecontent.h"
+#include "qplacecontentreply.h"
+#include "qplacecontentrequest.h"
+#include "qplacedetailsreply.h"
+#include "qplaceeditorial.h"
+#include "qplaceicon.h"
+#include "qplaceidreply.h"
+#include "qplaceimage.h"
+#include "qplacemanager.h"
+#include "qplacemanagerengine.h"
+#include "qplacematchreply.h"
+#include "qplacematchrequest.h"
+#include "qplaceproposedsearchresult.h"
+#include "qplaceratings.h"
+#include "qplacereply.h"
+#include "qplaceresult.h"
+#include "qplacereview.h"
+#include "qplacesearchreply.h"
+#include "qplacesearchrequest.h"
+#include "qplacesearchresult.h"
+#include "qplacesearchsuggestionreply.h"
+#include "qplacesupplier.h"
+#include "qplaceuser.h"
+#include "qtlocationversion.h"
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/QtLocationVersion new/qtlocation-opensource-src-5.3.2/include/QtLocation/QtLocationVersion
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/QtLocationVersion 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/QtLocationVersion 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qtlocationversion.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/headers.pri new/qtlocation-opensource-src-5.3.2/include/QtLocation/headers.pri
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/headers.pri 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/headers.pri 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1,5 @@
+SYNCQT.HEADER_FILES = qlocation.h qlocationglobal.h maps/qgeocodereply.h maps/qgeocodingmanager.h maps/qgeocodingmanagerengine.h maps/qgeomaneuver.h maps/qgeoroute.h maps/qgeoroutereply.h maps/qgeorouterequest.h maps/qgeoroutesegment.h maps/qgeoroutingmanager.h maps/qgeoroutingmanagerengine.h maps/qgeoserviceprovider.h maps/qgeoserviceproviderfactory.h places/placemacro.h places/qplace.h places/qplaceattribute.h places/qplacecategory.h places/qplacecontactdetail.h places/qplacecontent.h places/qplacecontentreply.h places/qplacecontentrequest.h places/qplacedetailsreply.h places/qplaceeditorial.h places/qplaceicon.h places/qplaceidreply.h places/qplaceimage.h places/qplacemanager.h places/qplacemanagerengine.h places/qplacematchreply.h places/qplacematchrequest.h places/qplaceproposedsearchresult.h places/qplaceratings.h places/qplacereply.h places/qplaceresult.h places/qplacereview.h places/qplacesearchreply.h places/qplacesearchrequest.h places/qplacesearchresult.h places/qplacesearchsuggestionreply.h places/qplacesupplier.h places/qplaceuser.h ../../include/QtLocation/qtlocationversion.h ../../include/QtLocation/QtLocation
+SYNCQT.HEADER_CLASSES = ../../include/QtLocation/QLocation ../../include/QtLocation/QGeoCodeReply ../../include/QtLocation/QGeoCodingManager ../../include/QtLocation/QGeoCodingManagerEngine ../../include/QtLocation/QGeoManeuver ../../include/QtLocation/QGeoRoute ../../include/QtLocation/QGeoRouteReply ../../include/QtLocation/QGeoRouteRequest ../../include/QtLocation/QGeoRouteSegment ../../include/QtLocation/QGeoRoutingManager ../../include/QtLocation/QGeoRoutingManagerEngine ../../include/QtLocation/QGeoServiceProvider ../../include/QtLocation/QGeoServiceProviderFactory ../../include/QtLocation/QPlace ../../include/QtLocation/QPlaceAttribute ../../include/QtLocation/QPlaceCategory ../../include/QtLocation/QPlaceContactDetail ../../include/QtLocation/QPlaceContent ../../include/QtLocation/QPlaceContentReply ../../include/QtLocation/QPlaceContentRequest ../../include/QtLocation/QPlaceDetailsReply ../../include/QtLocation/QPlaceEditorial ../../include/QtLocation/QPlaceIcon ../../include/QtLocation/QPlaceIdReply ../../include/QtLocation/QPlaceImage ../../include/QtLocation/QPlaceManager ../../include/QtLocation/QPlaceManagerEngine ../../include/QtLocation/QPlaceMatchReply ../../include/QtLocation/QPlaceMatchRequest ../../include/QtLocation/QPlaceProposedSearchResult ../../include/QtLocation/QPlaceRatings ../../include/QtLocation/QPlaceReply ../../include/QtLocation/QPlaceResult ../../include/QtLocation/QPlaceReview ../../include/QtLocation/QPlaceSearchReply ../../include/QtLocation/QPlaceSearchRequest ../../include/QtLocation/QPlaceSearchResult ../../include/QtLocation/QPlaceSearchSuggestionReply ../../include/QtLocation/QPlaceSupplier ../../include/QtLocation/QPlaceUser ../../include/QtLocation/QtLocationVersion
+SYNCQT.PRIVATE_HEADER_FILES = maps/qcache3q_p.h maps/qgeocameracapabilities_p.h maps/qgeocameradata_p.h maps/qgeocameratiles_p.h maps/qgeocodereply_p.h maps/qgeocodingmanager_p.h maps/qgeocodingmanagerengine_p.h maps/qgeomaneuver_p.h maps/qgeomap_p.h maps/qgeomapcontroller_p.h maps/qgeomapdata_p.h maps/qgeomapdata_p_p.h maps/qgeomappingmanager_p.h maps/qgeomappingmanager_p_p.h maps/qgeomappingmanagerengine_p.h maps/qgeomappingmanagerengine_p_p.h maps/qgeomapscene_p.h maps/qgeomaptype_p.h maps/qgeomaptype_p_p.h maps/qgeoroute_p.h maps/qgeoroutereply_p.h maps/qgeorouterequest_p.h maps/qgeoroutesegment_p.h maps/qgeoroutingmanager_p.h maps/qgeoroutingmanagerengine_p.h maps/qgeoserviceprovider_p.h maps/qgeotilecache_p.h maps/qgeotiledmapdata_p.h maps/qgeotiledmapdata_p_p.h maps/qgeotiledmappingmanagerengine_p.h maps/qgeotiledmappingmanagerengine_p_p.h maps/qgeotiledmapreply_p.h maps/qgeotiledmapreply_p_p.h maps/qgeotilefetcher_p.h maps/qgeotilefetcher_p_p.h maps/qgeotilerequestmanager_p.h maps/qgeotilespec_p.h maps/qgeotilespec_p_p.h places/qplace_p.h places/qplaceattribute_p.h places/qplacecategory_p.h places/qplacecontactdetail_p.h places/qplacecontent_p.h places/qplacecontentrequest_p.h places/qplaceeditorial_p.h places/qplaceicon_p.h places/qplaceimage_p.h places/qplacemanagerengine_p.h places/qplaceproposedsearchresult_p.h places/qplaceratings_p.h places/qplacereply_p.h places/qplaceresult_p.h places/qplacereview_p.h places/qplacesearchresult_p.h places/qplacesupplier_p.h places/qplaceuser_p.h places/unsupportedreplies_p.h
+SYNCQT.QPA_HEADER_FILES =
+SYNCQT.INJECTIONS =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/placemacro.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/placemacro.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/placemacro.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/placemacro.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/placemacro.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeocodereply.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeocodereply.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeocodereply.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeocodereply.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/maps/qgeocodereply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeocodingmanager.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeocodingmanager.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeocodingmanager.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeocodingmanager.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/maps/qgeocodingmanager.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeocodingmanagerengine.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeocodingmanagerengine.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeocodingmanagerengine.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeocodingmanagerengine.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/maps/qgeocodingmanagerengine.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeomaneuver.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeomaneuver.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeomaneuver.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeomaneuver.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/maps/qgeomaneuver.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroute.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroute.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroute.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroute.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/maps/qgeoroute.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutereply.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutereply.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutereply.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutereply.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/maps/qgeoroutereply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeorouterequest.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeorouterequest.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeorouterequest.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeorouterequest.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/maps/qgeorouterequest.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutesegment.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutesegment.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutesegment.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutesegment.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/maps/qgeoroutesegment.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutingmanager.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutingmanager.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutingmanager.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutingmanager.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/maps/qgeoroutingmanager.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutingmanagerengine.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutingmanagerengine.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutingmanagerengine.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoroutingmanagerengine.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/maps/qgeoroutingmanagerengine.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoserviceprovider.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoserviceprovider.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoserviceprovider.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoserviceprovider.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/maps/qgeoserviceprovider.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoserviceproviderfactory.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoserviceproviderfactory.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoserviceproviderfactory.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qgeoserviceproviderfactory.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/maps/qgeoserviceproviderfactory.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qlocation.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qlocation.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qlocation.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qlocation.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/qlocation.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qlocationglobal.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qlocationglobal.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qlocationglobal.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qlocationglobal.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/qlocationglobal.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplace.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplace.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplace.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplace.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplace.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceattribute.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceattribute.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceattribute.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceattribute.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplaceattribute.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecategory.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecategory.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecategory.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecategory.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacecategory.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontactdetail.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontactdetail.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontactdetail.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontactdetail.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacecontactdetail.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontent.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontent.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontent.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontent.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacecontent.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontentreply.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontentreply.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontentreply.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontentreply.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacecontentreply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontentrequest.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontentrequest.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontentrequest.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacecontentrequest.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacecontentrequest.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacedetailsreply.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacedetailsreply.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacedetailsreply.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacedetailsreply.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacedetailsreply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceeditorial.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceeditorial.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceeditorial.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceeditorial.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplaceeditorial.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceicon.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceicon.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceicon.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceicon.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplaceicon.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceidreply.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceidreply.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceidreply.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceidreply.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplaceidreply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceimage.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceimage.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceimage.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceimage.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplaceimage.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacemanager.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacemanager.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacemanager.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacemanager.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacemanager.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacemanagerengine.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacemanagerengine.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacemanagerengine.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacemanagerengine.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacemanagerengine.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacematchreply.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacematchreply.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacematchreply.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacematchreply.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacematchreply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacematchrequest.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacematchrequest.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacematchrequest.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacematchrequest.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacematchrequest.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceproposedsearchresult.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceproposedsearchresult.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceproposedsearchresult.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceproposedsearchresult.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplaceproposedsearchresult.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceratings.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceratings.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceratings.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceratings.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplaceratings.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacereply.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacereply.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacereply.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacereply.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacereply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceresult.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceresult.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceresult.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceresult.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplaceresult.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacereview.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacereview.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacereview.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacereview.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacereview.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchreply.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchreply.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchreply.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchreply.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacesearchreply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchrequest.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchrequest.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchrequest.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchrequest.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacesearchrequest.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchresult.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchresult.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchresult.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchresult.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacesearchresult.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchsuggestionreply.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchsuggestionreply.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchsuggestionreply.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesearchsuggestionreply.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacesearchsuggestionreply.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesupplier.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesupplier.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesupplier.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplacesupplier.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplacesupplier.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceuser.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceuser.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceuser.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qplaceuser.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/location/places/qplaceuser.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtLocation/qtlocationversion.h new/qtlocation-opensource-src-5.3.2/include/QtLocation/qtlocationversion.h
--- old/qtlocation-opensource-src-5.3.2/include/QtLocation/qtlocationversion.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtLocation/qtlocationversion.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1,9 @@
+/* This file was generated by syncqt. */
+#ifndef QT_QTLOCATION_VERSION_H
+#define QT_QTLOCATION_VERSION_H
+
+#define QTLOCATION_VERSION_STR "5.3.2"
+
+#define QTLOCATION_VERSION 0x050302
+
+#endif // QT_QTLOCATION_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdeclarativegeoaddress_p.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdeclarativegeoaddress_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdeclarativegeoaddress_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdeclarativegeoaddress_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qdeclarativegeoaddress_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdeclarativegeolocation_p.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdeclarativegeolocation_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdeclarativegeolocation_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdeclarativegeolocation_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qdeclarativegeolocation_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdoublevector2d_p.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdoublevector2d_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdoublevector2d_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdoublevector2d_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qdoublevector2d_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdoublevector3d_p.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdoublevector3d_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdoublevector3d_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qdoublevector3d_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qdoublevector3d_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeoaddress_p.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeoaddress_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeoaddress_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeoaddress_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeoaddress_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeocircle_p.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeocircle_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeocircle_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeocircle_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeocircle_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeocoordinate_p.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeocoordinate_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeocoordinate_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeocoordinate_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeocoordinate_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeolocation_p.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeolocation_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeolocation_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeolocation_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeolocation_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeopositioninfosource_p.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeopositioninfosource_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeopositioninfosource_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeopositioninfosource_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeopositioninfosource_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeoprojection_p.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeoprojection_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeoprojection_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeoprojection_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeoprojection_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeorectangle_p.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeorectangle_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeorectangle_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeorectangle_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeorectangle_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeoshape_p.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeoshape_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeoshape_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qgeoshape_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qgeoshape_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qlocationutils_p.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qlocationutils_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qlocationutils_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qlocationutils_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qlocationutils_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qnmeapositioninfosource_p.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qnmeapositioninfosource_p.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qnmeapositioninfosource_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/5.3.2/QtPositioning/private/qnmeapositioninfosource_p.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/positioning/qnmeapositioninfosource_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoAddress new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoAddress
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoAddress 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoAddress 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeoaddress.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoAreaMonitorInfo new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoAreaMonitorInfo
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoAreaMonitorInfo 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoAreaMonitorInfo 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeoareamonitorinfo.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoAreaMonitorSource new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoAreaMonitorSource
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoAreaMonitorSource 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoAreaMonitorSource 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeoareamonitorsource.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoCircle new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoCircle
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoCircle 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoCircle 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeocircle.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoCoordinate new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoCoordinate
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoCoordinate 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoCoordinate 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeocoordinate.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoLocation new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoLocation
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoLocation 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoLocation 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeolocation.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoPositionInfo new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoPositionInfo
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoPositionInfo 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoPositionInfo 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeopositioninfo.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoPositionInfoSource new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoPositionInfoSource
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoPositionInfoSource 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoPositionInfoSource 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeopositioninfosource.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoPositionInfoSourceFactory new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoPositionInfoSourceFactory
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoPositionInfoSourceFactory 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoPositionInfoSourceFactory 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeopositioninfosourcefactory.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoRectangle new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoRectangle
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoRectangle 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoRectangle 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeorectangle.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoSatelliteInfo new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoSatelliteInfo
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoSatelliteInfo 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoSatelliteInfo 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeosatelliteinfo.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoSatelliteInfoSource new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoSatelliteInfoSource
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoSatelliteInfoSource 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoSatelliteInfoSource 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeosatelliteinfosource.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoShape new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoShape
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoShape 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QGeoShape 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qgeoshape.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QNmeaPositionInfoSource new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QNmeaPositionInfoSource
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QNmeaPositionInfoSource 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QNmeaPositionInfoSource 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qnmeapositioninfosource.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QtPositioning new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QtPositioning
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QtPositioning 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QtPositioning 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1,20 @@
+#ifndef QT_QTPOSITIONING_MODULE_H
+#define QT_QTPOSITIONING_MODULE_H
+#include <QtPositioning/QtPositioningDepends>
+#include "qgeoaddress.h"
+#include "qgeoareamonitorinfo.h"
+#include "qgeoareamonitorsource.h"
+#include "qgeocircle.h"
+#include "qgeocoordinate.h"
+#include "qgeolocation.h"
+#include "qgeopositioninfo.h"
+#include "qgeopositioninfosource.h"
+#include "qgeopositioninfosourcefactory.h"
+#include "qgeorectangle.h"
+#include "qgeosatelliteinfo.h"
+#include "qgeosatelliteinfosource.h"
+#include "qgeoshape.h"
+#include "qnmeapositioninfosource.h"
+#include "qpositioningglobal.h"
+#include "qtpositioningversion.h"
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QtPositioningVersion new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QtPositioningVersion
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/QtPositioningVersion 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/QtPositioningVersion 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "qtpositioningversion.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/headers.pri new/qtlocation-opensource-src-5.3.2/include/QtPositioning/headers.pri
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/headers.pri 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/headers.pri 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1,5 @@
+SYNCQT.HEADER_FILES = qgeoaddress.h qgeoareamonitorinfo.h qgeoareamonitorsource.h qgeocircle.h qgeocoordinate.h qgeolocation.h qgeopositioninfo.h qgeopositioninfosource.h qgeopositioninfosourcefactory.h qgeorectangle.h qgeosatelliteinfo.h qgeosatelliteinfosource.h qgeoshape.h qnmeapositioninfosource.h qpositioningglobal.h ../../include/QtPositioning/qtpositioningversion.h ../../include/QtPositioning/QtPositioning
+SYNCQT.HEADER_CLASSES = ../../include/QtPositioning/QGeoAddress ../../include/QtPositioning/QGeoAreaMonitorInfo ../../include/QtPositioning/QGeoAreaMonitorSource ../../include/QtPositioning/QGeoCircle ../../include/QtPositioning/QGeoCoordinate ../../include/QtPositioning/QGeoLocation ../../include/QtPositioning/QGeoPositionInfo ../../include/QtPositioning/QGeoPositionInfoSource ../../include/QtPositioning/QGeoPositionInfoSourceFactory ../../include/QtPositioning/QGeoRectangle ../../include/QtPositioning/QGeoSatelliteInfo ../../include/QtPositioning/QGeoSatelliteInfoSource ../../include/QtPositioning/QGeoShape ../../include/QtPositioning/QNmeaPositionInfoSource ../../include/QtPositioning/QtPositioningVersion
+SYNCQT.PRIVATE_HEADER_FILES = qdeclarativegeoaddress_p.h qdeclarativegeolocation_p.h qdoublevector2d_p.h qdoublevector3d_p.h qgeoaddress_p.h qgeocircle_p.h qgeocoordinate_p.h qgeolocation_p.h qgeopositioninfosource_p.h qgeoprojection_p.h qgeorectangle_p.h qgeoshape_p.h qlocationutils_p.h qnmeapositioninfosource_p.h
+SYNCQT.QPA_HEADER_FILES =
+SYNCQT.INJECTIONS =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoaddress.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoaddress.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoaddress.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoaddress.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/positioning/qgeoaddress.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoareamonitorinfo.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoareamonitorinfo.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoareamonitorinfo.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoareamonitorinfo.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/positioning/qgeoareamonitorinfo.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoareamonitorsource.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoareamonitorsource.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoareamonitorsource.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoareamonitorsource.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/positioning/qgeoareamonitorsource.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeocircle.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeocircle.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeocircle.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeocircle.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/positioning/qgeocircle.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeocoordinate.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeocoordinate.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeocoordinate.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeocoordinate.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/positioning/qgeocoordinate.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeolocation.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeolocation.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeolocation.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeolocation.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/positioning/qgeolocation.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeopositioninfo.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeopositioninfo.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeopositioninfo.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeopositioninfo.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/positioning/qgeopositioninfo.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeopositioninfosource.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeopositioninfosource.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeopositioninfosource.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeopositioninfosource.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/positioning/qgeopositioninfosource.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeopositioninfosourcefactory.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeopositioninfosourcefactory.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeopositioninfosourcefactory.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeopositioninfosourcefactory.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/positioning/qgeopositioninfosourcefactory.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeorectangle.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeorectangle.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeorectangle.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeorectangle.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/positioning/qgeorectangle.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeosatelliteinfo.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeosatelliteinfo.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeosatelliteinfo.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeosatelliteinfo.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/positioning/qgeosatelliteinfo.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeosatelliteinfosource.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeosatelliteinfosource.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeosatelliteinfosource.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeosatelliteinfosource.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/positioning/qgeosatelliteinfosource.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoshape.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoshape.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoshape.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qgeoshape.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/positioning/qgeoshape.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qnmeapositioninfosource.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qnmeapositioninfosource.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qnmeapositioninfosource.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qnmeapositioninfosource.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/positioning/qnmeapositioninfosource.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qpositioningglobal.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qpositioningglobal.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qpositioningglobal.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qpositioningglobal.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1 @@
+#include "../../src/positioning/qpositioningglobal.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qtpositioningversion.h new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qtpositioningversion.h
--- old/qtlocation-opensource-src-5.3.2/include/QtPositioning/qtpositioningversion.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlocation-opensource-src-5.3.2/include/QtPositioning/qtpositioningversion.h 2014-09-11 12:48:30.000000000 +0200
@@ -0,0 +1,9 @@
+/* This file was generated by syncqt. */
+#ifndef QT_QTPOSITIONING_VERSION_H
+#define QT_QTPOSITIONING_VERSION_H
+
+#define QTPOSITIONING_VERSION_STR "5.3.2"
+
+#define QTPOSITIONING_VERSION 0x050302
+
+#endif // QT_QTPOSITIONING_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-qtimageformats for openSUSE:Factory checked in at 2014-09-18 07:56:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-09-08 21:28:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtimageformats.new/libqt5-qtimageformats.changes 2014-09-18 07:56:45.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 16 11:27:51 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2 final
+ * No changes since previous snapshot
+ * Use official tars
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtimageformats.spec ++++++
--- /var/tmp/diff_new_pack.GorpO3/_old 2014-09-18 07:56:46.000000000 +0200
+++ /var/tmp/diff_new_pack.GorpO3/_new 2014-09-18 07:56:46.000000000 +0200
@@ -16,10 +16,10 @@
#
-%define qt5_snapshot 1
+%define qt5_snapshot 0
Name: libqt5-qtimageformats
-Version: 5.3.2~git20140904
+Version: 5.3.2
Release: 0
Summary: Qt 5 Image Format Plugins
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
++++++ qtimageformats-opensource-src-5.3.2.tar.xz ++++++
--
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-18 07:56:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-09-08 21:28:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtgraphicaleffects.new/libqt5-qtgraphicaleffects.changes 2014-09-18 07:56:43.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 16 11:27:51 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2 final
+ * No changes since previous snapshot
+ * Use official tars
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtgraphicaleffects.spec ++++++
--- /var/tmp/diff_new_pack.nOIE2i/_old 2014-09-18 07:56:45.000000000 +0200
+++ /var/tmp/diff_new_pack.nOIE2i/_new 2014-09-18 07:56:45.000000000 +0200
@@ -16,10 +16,10 @@
#
-%define qt5_snapshot 1
+%define qt5_snapshot 0
Name: libqt5-qtgraphicaleffects
-Version: 5.3.2~git20140904
+Version: 5.3.2
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)
++++++ qtgraphicaleffects-opensource-src-5.3.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qtgraphicaleffects/qtgraphicaleffects-opensource-src-5.3.2.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-qtbase for openSUSE:Factory checked in at 2014-09-18 07:56:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-08 21:28:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes 2014-09-18 07:56:40.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 16 11:27:49 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2 final
+ * No changes since previous snapshot
+ * Use official tars
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtbase.spec ++++++
--- /var/tmp/diff_new_pack.bEWLXe/_old 2014-09-18 07:56:43.000000000 +0200
+++ /var/tmp/diff_new_pack.bEWLXe/_new 2014-09-18 07:56:43.000000000 +0200
@@ -16,11 +16,11 @@
#
-%define qt5_snapshot 1
+%define qt5_snapshot 0
%define journald 0
Name: libqt5-qtbase
-Version: 5.3.2~git20140904
+Version: 5.3.2
Release: 0
Summary: C++ Program Library, Core Components
License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1
++++++ qtbase-opensource-src-5.3.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qtbase/qtbase-opensource-src-5.3.2.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 libqt5-qtdeclarative for openSUSE:Factory checked in at 2014-09-18 07:56:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-08 21:28:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtdeclarative.new/libqt5-qtdeclarative.changes 2014-09-18 07:56:39.000000000 +0200
@@ -1,0 +2,16 @@
+Tue Sep 16 11:27:49 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.2 final
+ * No changes since previous snapshot
+ * Use official tars
+- Added patches from upstream 5.3 branch:
+ 0001-Fix-crash-with-cleanup-of-animators.patch (QTBUG#37833),
+ 0002-Support-padding-in-images-stored-in-atlas-texture.patch,
+ 0003-Fix-crashes-when-calling-Array.sort-with-imperfect-s.patch
+ (QTBUG#39072),
+ 0004-QML-parse-.js-files-as-JavaScript-not-QML.patch (QTBUG#40143),
+ 0005-Fix-crash-with-foreach-on-arguments-object.patch (QTBUG#40844)
+ and 0006-Move-syncTimer-measurment-to-the-correct-place.patch
+ (QTBUG#40556)
+
+-------------------------------------------------------------------
New:
----
0001-Fix-crash-with-cleanup-of-animators.patch
0002-Support-padding-in-images-stored-in-atlas-texture.patch
0003-Fix-crashes-when-calling-Array.sort-with-imperfect-s.patch
0004-QML-parse-.js-files-as-JavaScript-not-QML.patch
0005-Fix-crash-with-foreach-on-arguments-object.patch
0006-Move-syncTimer-measurment-to-the-correct-place.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtdeclarative.spec ++++++
--- /var/tmp/diff_new_pack.1cvob4/_old 2014-09-18 07:56:40.000000000 +0200
+++ /var/tmp/diff_new_pack.1cvob4/_new 2014-09-18 07:56:40.000000000 +0200
@@ -16,12 +16,12 @@
#
-%define qt5_snapshot 1
+%define qt5_snapshot 0
%define libname libQtQuick5
Name: libqt5-qtdeclarative
-Version: 5.3.2~git20140904
+Version: 5.3.2
Release: 0
Summary: Qt 5 Declarative Library
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
@@ -33,6 +33,13 @@
%define tar_version qtdeclarative-opensource-src-%{real_version}
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
+# PATCHES FROM UPSTREAM 5.3 branch
+Patch0: 0001-Fix-crash-with-cleanup-of-animators.patch
+Patch1: 0002-Support-padding-in-images-stored-in-atlas-texture.patch
+Patch2: 0003-Fix-crashes-when-calling-Array.sort-with-imperfect-s.patch
+Patch3: 0004-QML-parse-.js-files-as-JavaScript-not-QML.patch
+Patch4: 0005-Fix-crash-with-foreach-on-arguments-object.patch
+Patch5: 0006-Move-syncTimer-measurment-to-the-correct-place.patch
BuildRequires: fdupes
BuildRequires: libQt5Core-private-headers-devel >= %{version}
BuildRequires: libQt5Gui-private-headers-devel >= %{version}
@@ -62,6 +69,12 @@
%prep
%setup -q -n qtdeclarative-opensource-src-%{real_version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%package -n %libname
Summary: Qt 5 Declarative Library
++++++ 0001-Fix-crash-with-cleanup-of-animators.patch ++++++
>From 8f3311276e4ca44acb69c8870ccfc3167682b898 Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar(a)sletta.org>
Date: Thu, 28 Aug 2014 11:27:02 +0200
Subject: [PATCH 1/6] Fix crash with cleanup of animators.
We had several separate issues relating to how the jobs were cleaned up.
The first was that upon getting setWindow(0), the animator did not
reset m_controller to 0, leading to the starts() coming after that to
post null jobs to the controller. This would later crash in
beforeNodeSync as the starting job was null.
The second issue was that during shutdown, QQuickAnimatorProxy
would try to delete jobs on the controller which was already
deleted. The controller is deleted on the GUI thread regardless
of render loop, so this was solved with a QPointer.
The third was that we were a bit too aggressive in trying to clean up
jobs on the GUI thread, so we introduced a new bool which gets set to
true in startJob() so that Proxy::deleteJob() knows who owns the job.
Task-number: QTBUG-37833
Change-Id: I1b6221a2c1ce2bfd0758801b950cda00ff6899d0
Reviewed-by: Michael Brasser <michael.brasser(a)live.com>
---
src/quick/util/qquickanimatorcontroller.cpp | 1 +
src/quick/util/qquickanimatorjob.cpp | 14 ++++++++++----
src/quick/util/qquickanimatorjob_p.h | 4 +++-
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/quick/util/qquickanimatorcontroller.cpp b/src/quick/util/qquickanimatorcontroller.cpp
index 697c25b..f8e24bf 100644
--- a/src/quick/util/qquickanimatorcontroller.cpp
+++ b/src/quick/util/qquickanimatorcontroller.cpp
@@ -262,6 +262,7 @@ void QQuickAnimatorController::requestSync()
// These functions are called on the GUI thread.
void QQuickAnimatorController::startJob(QQuickAnimatorProxyJob *proxy, QAbstractAnimationJob *job)
{
+ proxy->markJobManagedByController();
m_starting[job] = proxy;
requestSync();
}
diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp
index 9f81f28..d61066b 100644
--- a/src/quick/util/qquickanimatorjob.cpp
+++ b/src/quick/util/qquickanimatorjob.cpp
@@ -57,6 +57,7 @@ QQuickAnimatorProxyJob::QQuickAnimatorProxyJob(QAbstractAnimationJob *job, QObje
: m_controller(0)
, m_job(job)
, m_internalState(State_Stopped)
+ , m_jobManagedByController(false)
{
m_isRenderThreadProxy = true;
m_animation = qobject_cast<QQuickAbstractAnimation *>(item);
@@ -101,7 +102,10 @@ void QQuickAnimatorProxyJob::deleteJob()
// so delete it through the controller to clean up properly.
if (m_controller)
m_controller->deleteJob(m_job);
- else
+
+ // We explicitly delete the job if the animator controller has never touched
+ // it. If it has, it will have ownership as well.
+ else if (!m_jobManagedByController)
delete m_job;
m_job = 0;
}
@@ -149,11 +153,13 @@ void QQuickAnimatorProxyJob::controllerWasDeleted()
void QQuickAnimatorProxyJob::setWindow(QQuickWindow *window)
{
if (!window) {
- // Stop will trigger syncBackCurrentValues so best to do it before
- // we delete m_job.
stop();
deleteJob();
- return;
+
+ // Upon leaving a window, we reset the controller. This means that
+ // animators will only enter the Starting phase and won't be making
+ // calls to QQuickAnimatorController::startjob().
+ m_controller = 0;
} else if (!m_controller && m_job) {
m_controller = QQuickWindowPrivate::get(window)->animationController;
diff --git a/src/quick/util/qquickanimatorjob_p.h b/src/quick/util/qquickanimatorjob_p.h
index 03b13bc..1ebf12f 100644
--- a/src/quick/util/qquickanimatorjob_p.h
+++ b/src/quick/util/qquickanimatorjob_p.h
@@ -77,6 +77,7 @@ public:
void startedByController();
void controllerWasDeleted();
+ void markJobManagedByController() { m_jobManagedByController = true; }
protected:
bool event(QEvent *);
@@ -95,7 +96,7 @@ private:
void setWindow(QQuickWindow *window);
static QObject *findAnimationContext(QQuickAbstractAnimation *);
- QQuickAnimatorController *m_controller;
+ QPointer<QQuickAnimatorController> m_controller;
QQuickAbstractAnimation *m_animation;
QAbstractAnimationJob *m_job;
int m_duration;
@@ -108,6 +109,7 @@ private:
};
InternalState m_internalState;
+ bool m_jobManagedByController;
};
class Q_QUICK_PRIVATE_EXPORT QQuickAnimatorJob : public QAbstractAnimationJob
--
2.1.0
++++++ 0002-Support-padding-in-images-stored-in-atlas-texture.patch ++++++
>From cf44ee7761f2e4175f9193b42ee7296a2f3b694a Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt(a)digia.com>
Date: Fri, 29 Aug 2014 15:40:52 +0200
Subject: [PATCH 2/6] Support padding in images stored in atlas texture
If the stride does not match the width of the image, we upload
it line-by-line instead of as one big rect.
Change-Id: I5e08afcf5c35dc810fed25e45255d55d932b2a4c
Reviewed-by: Gunnar Sletta <gunnar(a)sletta.org>
---
src/quick/scenegraph/util/qsgatlastexture.cpp | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp
index 782beca..53b3110 100644
--- a/src/quick/scenegraph/util/qsgatlastexture.cpp
+++ b/src/quick/scenegraph/util/qsgatlastexture.cpp
@@ -319,7 +319,16 @@ void Atlas::uploadBgra(Texture *texture)
glTexSubImage2D(GL_TEXTURE_2D, 0, r.x() + iw + 1, r.y() + 1, 1, ih, m_externalFormat, GL_UNSIGNED_BYTE, dst);
// Inner part of the image....
- glTexSubImage2D(GL_TEXTURE_2D, 0, r.x() + 1, r.y() + 1, r.width() - 2, r.height() - 2, m_externalFormat, GL_UNSIGNED_BYTE, src);
+ if (bpl != iw) {
+ int sy = r.y() + 1;
+ int ey = sy + r.height() - 2;
+ for (int y = sy; y < ey; ++y) {
+ glTexSubImage2D(GL_TEXTURE_2D, 0, r.x() + 1, y, r.width() - 2, 1, m_externalFormat, GL_UNSIGNED_BYTE, src);
+ src += bpl;
+ }
+ } else {
+ glTexSubImage2D(GL_TEXTURE_2D, 0, r.x() + 1, r.y() + 1, r.width() - 2, r.height() - 2, m_externalFormat, GL_UNSIGNED_BYTE, src);
+ }
}
--
2.1.0
++++++ 0003-Fix-crashes-when-calling-Array.sort-with-imperfect-s.patch ++++++
>From 210475565969ca5381174016b47cd32ddc96eaed Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll(a)digia.com>
Date: Thu, 12 Jun 2014 14:35:53 +0200
Subject: [PATCH 3/6] Fix crashes when calling Array.sort with imperfect sort
functions
We can't use std::sort to implement Array.sort. The reason is that
std::sort expects a conformant compare function, and can do weird
things (esp. crash) when the sort function isn't conformant.
Falling back to qSort is not possible, as the method has been
deprecated. So add a copy of the qSort implementation here, and
use that one instead.
Fix the sortint test in tst_qqmlecmascript to have a consistent
sort function for strings, as the result of calling sort is
otherwise undefined according to the ecma standard.
Task-number: QTBUG-39072
Change-Id: I0602b3aa1ffa4de5006da58396f166805cf4a5e2
Reviewed-by: Robin Burchell <robin.burchell(a)viroteck.net>
Reviewed-by: Simon Hausmann <simon.hausmann(a)digia.com>
---
src/qml/jsruntime/qv4arraydata.cpp | 56 +++++++++++++++++++++-
tests/auto/qml/qjsengine/tst_qjsengine.cpp | 19 ++++++++
.../auto/qml/qqmlecmascript/data/sequenceSort.qml | 2 +-
3 files changed, 75 insertions(+), 2 deletions(-)
diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp
index 7d76a10..9627848 100644
--- a/src/qml/jsruntime/qv4arraydata.cpp
+++ b/src/qml/jsruntime/qv4arraydata.cpp
@@ -674,6 +674,60 @@ bool ArrayElementLessThan::operator()(Value v1, Value v2) const
return p1s->toQString() < p2s->toQString();
}
+template <typename RandomAccessIterator, typename T, typename LessThan>
+void sortHelper(RandomAccessIterator start, RandomAccessIterator end, const T &t, LessThan lessThan)
+{
+top:
+ int span = int(end - start);
+ if (span < 2)
+ return;
+
+ --end;
+ RandomAccessIterator low = start, high = end - 1;
+ RandomAccessIterator pivot = start + span / 2;
+
+ if (lessThan(*end, *start))
+ qSwap(*end, *start);
+ if (span == 2)
+ return;
+
+ if (lessThan(*pivot, *start))
+ qSwap(*pivot, *start);
+ if (lessThan(*end, *pivot))
+ qSwap(*end, *pivot);
+ if (span == 3)
+ return;
+
+ qSwap(*pivot, *end);
+
+ while (low < high) {
+ while (low < high && lessThan(*low, *end))
+ ++low;
+
+ while (high > low && lessThan(*end, *high))
+ --high;
+
+ if (low < high) {
+ qSwap(*low, *high);
+ ++low;
+ --high;
+ } else {
+ break;
+ }
+ }
+
+ if (lessThan(*low, *end))
+ ++low;
+
+ qSwap(*end, *low);
+ sortHelper(start, low, t, lessThan);
+
+ start = low + 1;
+ ++end;
+ goto top;
+}
+
+
void ArrayData::sort(ExecutionContext *context, ObjectRef thisObject, const ValueRef comparefn, uint len)
{
if (!len)
@@ -765,7 +819,7 @@ void ArrayData::sort(ExecutionContext *context, ObjectRef thisObject, const Valu
ArrayElementLessThan lessThan(context, thisObject, comparefn);
Value *begin = thisObject->arrayData->data;
- std::sort(begin, begin + len, lessThan);
+ sortHelper(begin, begin + len, *begin, lessThan);
#ifdef CHECK_SPARSE_ARRAYS
thisObject->initSparseArray();
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index 51cd699..4b47e55 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -135,6 +135,7 @@ private slots:
void reentrancy_objectCreation();
void jsIncDecNonObjectProperty();
void JSONparse();
+ void arraySort();
void qRegExpInport_data();
void qRegExpInport();
@@ -2729,6 +2730,24 @@ void tst_QJSEngine::JSONparse()
QVERIFY(ret.isObject());
}
+void tst_QJSEngine::arraySort()
+{
+ // tests that calling Array.sort with a bad sort function doesn't cause issues
+ // Using std::sort is e.g. not safe when used with a bad sort function and causes
+ // crashes
+ QJSEngine eng;
+ eng.evaluate("function crashMe() {"
+ " var data = [];"
+ " for (var i = 0; i < 50; i++) {"
+ " data[i] = 'whatever';"
+ " }"
+ " data.sort(function(a, b) {"
+ " return -1;"
+ " });"
+ "}"
+ "crashMe();");
+}
+
static QRegExp minimal(QRegExp r) { r.setMinimal(true); return r; }
void tst_QJSEngine::qRegExpInport_data()
diff --git a/tests/auto/qml/qqmlecmascript/data/sequenceSort.qml b/tests/auto/qml/qqmlecmascript/data/sequenceSort.qml
index 5e2892a..b130408 100644
--- a/tests/auto/qml/qqmlecmascript/data/sequenceSort.qml
+++ b/tests/auto/qml/qqmlecmascript/data/sequenceSort.qml
@@ -23,7 +23,7 @@ Item {
}
function compareStrings(a, b) {
- return (a < b) ? 1 : -1;
+ return (a == b) ? 0 : ((a < b) ? 1 : -1);
}
function compareNumbers(a, b) {
--
2.1.0
++++++ 0004-QML-parse-.js-files-as-JavaScript-not-QML.patch ++++++
>From f7c3035fa1d965dceb36892122683a5ceb6cab89 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen(a)digia.com>
Date: Thu, 28 Aug 2014 13:12:53 +0200
Subject: [PATCH 4/6] QML: parse .js files as JavaScript, not QML.
When importing a JS library into a QML file with the "import" keyword,
that JS file was parsed in QML mode, disallowing QML keywords like "as".
Task-number: QTBUG-40143
Change-Id: Ie98adceb27544732c2e96657d41170db36bff288
Reviewed-by: Simon Hausmann <simon.hausmann(a)digia.com>
---
src/qml/jsruntime/qv4script.cpp | 2 +-
.../qml/qqmlecmascript/data/importScriptsWithoutQmlMode.js | 7 +++++++
.../qml/qqmlecmascript/data/importScriptsWithoutQmlMode.qml | 10 ++++++++++
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 11 +++++++++++
4 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 tests/auto/qml/qqmlecmascript/data/importScriptsWithoutQmlMode.js
create mode 100644 tests/auto/qml/qqmlecmascript/data/importScriptsWithoutQmlMode.qml
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index 36f61a1..4d6e069 100644
--- a/src/qml/jsruntime/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
@@ -349,7 +349,7 @@ QV4::CompiledData::CompilationUnit *Script::precompile(IR::Module *module, Compi
QQmlJS::Engine ee;
QQmlJS::Lexer lexer(&ee);
- lexer.setCode(source, /*line*/1, /*qml mode*/true);
+ lexer.setCode(source, /*line*/1, /*qml mode*/false);
QQmlJS::Parser parser(&ee);
parser.parseProgram();
diff --git a/tests/auto/qml/qqmlecmascript/data/importScriptsWithoutQmlMode.js b/tests/auto/qml/qqmlecmascript/data/importScriptsWithoutQmlMode.js
new file mode 100644
index 0000000..aabcc9f
--- /dev/null
+++ b/tests/auto/qml/qqmlecmascript/data/importScriptsWithoutQmlMode.js
@@ -0,0 +1,7 @@
+.pragma library
+
+var as = undefined
+function isLegal() {
+ var as = true;
+ return as;
+}
diff --git a/tests/auto/qml/qqmlecmascript/data/importScriptsWithoutQmlMode.qml b/tests/auto/qml/qqmlecmascript/data/importScriptsWithoutQmlMode.qml
new file mode 100644
index 0000000..17d1219
--- /dev/null
+++ b/tests/auto/qml/qqmlecmascript/data/importScriptsWithoutQmlMode.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.0
+
+import "importScriptsWithoutQmlMode.js" as Export
+
+Rectangle {
+ id: root
+ property bool success: false
+
+ Component.onCompleted: success = Export.isLegal()
+}
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 34413b2..7e9adea 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -321,6 +321,7 @@ private slots:
void lazyBindingEvaluation();
void varPropertyAccessOnObjectWithInvalidContext();
void importedScriptsAccessOnObjectWithInvalidContext();
+ void importedScriptsWithoutQmlMode();
void contextObjectOnLazyBindings();
void garbageCollectionDuringCreation();
@@ -7609,6 +7610,16 @@ void tst_qqmlecmascript::importedScriptsAccessOnObjectWithInvalidContext()
QTRY_VERIFY(obj->property("success") == true);
}
+void tst_qqmlecmascript::importedScriptsWithoutQmlMode()
+{
+ QQmlComponent component(&engine, testFileUrl("importScriptsWithoutQmlMode.qml"));
+ QScopedPointer<QObject> obj(component.create());
+ if (obj.isNull())
+ qDebug() << component.errors().first().toString();
+ QVERIFY(!obj.isNull());
+ QTRY_VERIFY(obj->property("success") == true);
+}
+
void tst_qqmlecmascript::contextObjectOnLazyBindings()
{
QQmlComponent component(&engine, testFileUrl("contextObjectOnLazyBindings.qml"));
--
2.1.0
++++++ 0005-Fix-crash-with-foreach-on-arguments-object.patch ++++++
>From 4d07bf91ed2d36aee9178ef48508c16277fbb318 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann(a)digia.com>
Date: Thu, 21 Aug 2014 16:24:54 +0200
Subject: [PATCH 5/6] Fix crash with foreach on arguments object
We call fullyCreate() on the arguments object when it's initialized
on an foreach iterator. That itself however might trigger an allocation,
which in turn might collect the ForEachIteratorObject, which is missing
a "ProtectThis" in its constructor.
Change-Id: Ib8f7e39201e727cde91cbbe8a82cba78aa980f0d
Task-number: QTBUG-40844
Reviewed-by: Albert Astals Cid <albert.astals(a)canonical.com>
Reviewed-by: Lars Knoll <lars.knoll(a)digia.com>
---
src/qml/jsruntime/qv4objectiterator.cpp | 40 +++++++++++++++++++++++++--------
src/qml/jsruntime/qv4objectiterator_p.h | 11 ++++-----
2 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/src/qml/jsruntime/qv4objectiterator.cpp b/src/qml/jsruntime/qv4objectiterator.cpp
index e5f693c..0efd304 100644
--- a/src/qml/jsruntime/qv4objectiterator.cpp
+++ b/src/qml/jsruntime/qv4objectiterator.cpp
@@ -54,13 +54,7 @@ ObjectIterator::ObjectIterator(Value *scratch1, Value *scratch2, const ObjectRef
, memberIndex(0)
, flags(flags)
{
- object = o.getPointer();
- current = o.getPointer();
-
- if (!!object && object->asArgumentsObject()) {
- Scope scope(object->engine());
- Scoped<ArgumentsObject> (scope, object->asReturnedValue())->fullyCreate();
- }
+ init(o);
}
ObjectIterator::ObjectIterator(Scope &scope, const ObjectRef o, uint flags)
@@ -71,8 +65,26 @@ ObjectIterator::ObjectIterator(Scope &scope, const ObjectRef o, uint flags)
, memberIndex(0)
, flags(flags)
{
- object = o;
- current = o;
+ init(o);
+}
+
+ObjectIterator::ObjectIterator(Value *scratch1, Value *scratch2, uint flags)
+ : object(ObjectRef::fromValuePointer(scratch1))
+ , current(ObjectRef::fromValuePointer(scratch2))
+ , arrayNode(0)
+ , arrayIndex(0)
+ , memberIndex(0)
+ , flags(flags)
+{
+ object = (Object*)0;
+ current = (Object*)0;
+ // Caller needs to call init!
+}
+
+void ObjectIterator::init(const ObjectRef o)
+{
+ object = o.getPointer();
+ current = o.getPointer();
if (!!object && object->asArgumentsObject()) {
Scope scope(object->engine());
@@ -194,6 +206,16 @@ ReturnedValue ObjectIterator::nextPropertyNameAsString()
DEFINE_OBJECT_VTABLE(ForEachIteratorObject);
+ForEachIteratorObject::ForEachIteratorObject(ExecutionContext *ctx, const ObjectRef o)
+ : Object(ctx->engine), it(workArea, workArea + 1, ObjectIterator::EnumerableOnly|ObjectIterator::WithProtoChain)
+{
+ Scope scope(ctx);
+ ScopedObject protectThis(scope, this);
+
+ setVTable(staticVTable());
+ it.init(o);
+}
+
void ForEachIteratorObject::markObjects(Managed *that, ExecutionEngine *e)
{
ForEachIteratorObject *o = static_cast<ForEachIteratorObject *>(that);
diff --git a/src/qml/jsruntime/qv4objectiterator_p.h b/src/qml/jsruntime/qv4objectiterator_p.h
index c87f284..5ead1f5 100644
--- a/src/qml/jsruntime/qv4objectiterator_p.h
+++ b/src/qml/jsruntime/qv4objectiterator_p.h
@@ -58,6 +58,7 @@ struct ExecutionContext;
struct Property;
struct String;
struct InternalClass;
+struct ForEachIteratorObject;
struct Q_QML_EXPORT ObjectIterator
{
@@ -76,21 +77,21 @@ struct Q_QML_EXPORT ObjectIterator
ObjectIterator(Value *scratch1, Value *scratch2, const ObjectRef o, uint flags);
ObjectIterator(Scope &scope, const ObjectRef o, uint flags);
+ void init(const ObjectRef o);
void next(StringRef name, uint *index, Property *pd, PropertyAttributes *attributes = 0);
ReturnedValue nextPropertyName(ValueRef value);
ReturnedValue nextPropertyNameAsString(ValueRef value);
ReturnedValue nextPropertyNameAsString();
+private:
+ friend struct ForEachIteratorObject;
+ ObjectIterator(Value *scratch1, Value *scratch2, uint flags); // Constructor that requires calling init()
};
struct ForEachIteratorObject: Object {
V4_OBJECT
Q_MANAGED_TYPE(ForeachIteratorObject)
ObjectIterator it;
- ForEachIteratorObject(ExecutionContext *ctx, const ObjectRef o)
- : Object(ctx->engine), it(workArea, workArea + 1,
- o, ObjectIterator::EnumerableOnly|ObjectIterator::WithProtoChain) {
- setVTable(staticVTable());
- }
+ ForEachIteratorObject(ExecutionContext *ctx, const ObjectRef o);
ReturnedValue nextPropertyName() { return it.nextPropertyNameAsString(); }
--
2.1.0
++++++ 0006-Move-syncTimer-measurment-to-the-correct-place.patch ++++++
>From 5a9f0131f8c0b7424a4d323b0f65237206be45ea Mon Sep 17 00:00:00 2001
From: Josh Arenson <joshua.arenson(a)canonical.com>
Date: Mon, 4 Aug 2014 09:42:27 -0700
Subject: [PATCH 6/6] Move syncTimer measurment to the correct place.
syncTimer was including the time spent waiting for VSYNC on unchanged
frames. This was causing the reported value to be much higher than expected.
Task-number: QTBUG-40556
Change-Id: Ife759b4e27faf2124ab330be8d1f42d15c4d2d33
Reviewed-by: Gunnar Sletta <gunnar(a)sletta.org>
---
src/quick/scenegraph/qsgthreadedrenderloop.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index c17eb91..1cfc689 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -586,6 +586,10 @@ void QSGRenderThread::syncAndRender()
QSG_RT_DEBUG(" - update pending, doing sync");
sync();
}
+#ifndef QSG_NO_RENDER_TIMING
+ if (profileFrames)
+ syncTime = threadTimer.nsecsElapsed();
+#endif
if (!syncResultedInChanges && !(repaintRequested)) {
QSG_RT_DEBUG(" - no changes, rendering aborted");
@@ -595,10 +599,6 @@ void QSGRenderThread::syncAndRender()
return;
}
-#ifndef QSG_NO_RENDER_TIMING
- if (profileFrames)
- syncTime = threadTimer.nsecsElapsed();
-#endif
QSG_RT_DEBUG(" - rendering starting");
QQuickWindowPrivate *d = QQuickWindowPrivate::get(window);
--
2.1.0
++++++ qtdeclarative-opensource-src-5.3.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qtdeclarative/qtdeclarative-opensource-src-5.3.2.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 telepathy-kde for openSUSE:Factory checked in at 2014-09-18 07:56:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/telepathy-kde (Old)
and /work/SRC/openSUSE:Factory/.telepathy-kde.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "telepathy-kde"
Changes:
--------
--- /work/SRC/openSUSE:Factory/telepathy-kde/telepathy-kde.changes 2014-08-16 15:37:54.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.telepathy-kde.new/telepathy-kde.changes 2014-09-18 07:56:37.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Sep 16 18:43:57 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 0.8.80 (0.9 beta):
+ * OTR support
+ * Improved group chats
+ * Modernised video chats, now based on GStreamer 1.0
+ * Lots of fixes and speed improvements
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ telepathy-kde.spec ++++++
--- /var/tmp/diff_new_pack.Jb4ei9/_old 2014-09-18 07:56:38.000000000 +0200
+++ /var/tmp/diff_new_pack.Jb4ei9/_new 2014-09-18 07:56:38.000000000 +0200
@@ -17,7 +17,7 @@
Name: telepathy-kde
-Version: 0.8.1
+Version: 0.8.80
Release: 0
Summary: Telepathy KDE meta package
License: GPL-2.0+
--
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 libkpeople for openSUSE:Factory checked in at 2014-09-18 07:56:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libkpeople (Old)
and /work/SRC/openSUSE:Factory/.libkpeople.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkpeople"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libkpeople/libkpeople.changes 2014-04-26 10:05:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libkpeople.new/libkpeople.changes 2014-09-18 07:56:36.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Sep 16 15:31:07 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 0.3.0
+ * New email plugin, based on baloo libraries
+- Use libkpeople for main package, and obsolete old package as
+ libkpeople didn't used shlib guidelines
+
+-------------------------------------------------------------------
Old:
----
libkpeople-0.2.2.tar.bz2
New:
----
libkpeople-0.3.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libkpeople.spec ++++++
--- /var/tmp/diff_new_pack.mBeNiz/_old 2014-09-18 07:56:37.000000000 +0200
+++ /var/tmp/diff_new_pack.mBeNiz/_new 2014-09-18 07:56:37.000000000 +0200
@@ -16,37 +16,32 @@
#
-%define soversion 3
+%define soversion 4
Name: libkpeople
-Version: 0.2.2
+Version: 0.3.0
Release: 0
Summary: Provides access to all contacts and the people who hold them
License: LGPL-2.1+
Group: Development/Libraries/Other
Url: https://projects.kde.org/projects/playground/network/libkpeople
-Source0: http://download.kde.org/unstable/%{name}/%{version}/src/%{name}-%{version}.…
+Source: http://download.kde.org/unstable/%{name}/%{version}/src/%{name}-%{version}.…
BuildRequires: libkde4-devel >= 4.10.1
BuildRequires: libkdepimlibs4-devel
+%if 0%{?suse_version} > 1310
+BuildRequires: baloo-devel
+%endif
+Obsoletes: libkpeople3
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
A library that provides access to all contacts and the people who hold them
-%package -n libkpeople%{soversion}
-Summary: Provides access to all contacts and the people who hold them
-Group: System/Libraries
-Recommends: %{name}-lang
-%kde4_runtime_requires
-
-%description -n libkpeople%{soversion}
-A library that provides access to all contacts and the people who hold them
-
%package devel
Summary: Provides access to all contacts and the people who hold them
Group: Development/Libraries/Other
+Requires: %{name} = %{version}
Requires: libkdepimlibs4-devel
-Requires: libkpeople%{soversion} = %{version}
%description devel
A library that provides access to all contacts and the people who hold them
@@ -56,10 +51,10 @@
%package lang
Summary: A library for accessing Facebook services
Group: Development/Libraries/KDE
-Requires: libkpeople%{soversion} = %{version}
+Requires: %{name} = %{version}
%description lang
-Provides translations to the package libkpeople%{soversion}
+Provides translations to the package %{name}
%prep
%setup -q
@@ -74,13 +69,13 @@
%find_lang %{name} %{name}.lang
-%post -n libkpeople%{soversion} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
-%postun -n libkpeople%{soversion} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files lang -f %{name}.lang
-%files -n libkpeople%{soversion}
+%files
%defattr(-,root,root)
%doc COPYING
%{_kde4_libdir}/libkpeople*.so.*
++++++ libkpeople-0.2.2.tar.bz2 -> libkpeople-0.3.0.tar.bz2 ++++++
++++ 2441 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