Hello community,
here is the log from the commit of package libqt5-qtconnectivity for openSUSE:Factory checked in at 2015-03-01 15:06:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtconnectivity (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtconnectivity.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtconnectivity"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtconnectivity/libqt5-qtconnectivity.changes 2015-02-18 12:08:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libqt5-qtconnectivity.new/libqt5-qtconnectivity.changes 2015-03-01 15:06:59.000000000 +0100
@@ -1,0 +2,9 @@
+Tue Feb 24 16:10:13 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.4.1
+ * For more details please see:
+ http://blog.qt.io/blog/2015/02/24/qt-5-4-1-released/
+- Split the imports into separate package
+- Add minimal requires on libQtQuick5, libQt5Core5 and libQt5DBus5
+
+-------------------------------------------------------------------
Old:
----
qtconnectivity-opensource-src-5.4.0.tar.xz
New:
----
qtconnectivity-opensource-src-5.4.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtconnectivity.spec ++++++
--- /var/tmp/diff_new_pack.IlTFpJ/_old 2015-03-01 15:07:00.000000000 +0100
+++ /var/tmp/diff_new_pack.IlTFpJ/_new 2015-03-01 15:07:00.000000000 +0100
@@ -19,11 +19,11 @@
%define qt5_snapshot 0
%define libname libQt5Bluetooth5
%define base_name libqt5
-%define real_version 5.4.0
-%define so_version 5.4.0
+%define real_version 5.4.1
+%define so_version 5.4.1
%define tar_version qtconnectivity-opensource-src-%{real_version}
Name: libqt5-qtconnectivity
-Version: 5.4.0
+Version: 5.4.1
Release: 0
Summary: Qt 5 Nfc Addon
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
@@ -55,6 +55,7 @@
Summary: Qt 5 Bluez Addon
Group: Development/Libraries/X11
Recommends: %{name}-tools
+%requires_ge libQt5DBus5
%description -n %{libname}
Qt is a set of libraries for developing applications.
@@ -62,10 +63,33 @@
%package -n libQt5Nfc5
Summary: Qt 5 Nfc Addon
Group: Development/Libraries/X11
+%requires_ge libQt5Core5
%description -n libQt5Nfc5
Qt is a set of libraries for developing applications.
+%package -n %{libname}-imports
+Summary: Qt 5 Bluez Addon
+Group: Development/Libraries/X11
+Supplements: packageand(%{libname}:libQtQuick5)
+# imports splited with 5.4.1
+Conflicts: %{libname} < 5.4.1
+%requires_ge libQtQuick5
+
+%description -n %{libname}-imports
+Qt is a set of libraries for developing applications.
+
+%package -n libQt5Nfc5-imports
+Summary: Qt 5 Nfc Addon
+Group: Development/Libraries/X11
+Supplements: packageand(libQt5Nfc5:libQtQuick5)
+# imports splited with 5.4.1
+Conflicts: libQt5Nfc5 < 5.4.1
+%requires_ge libQtQuick5
+
+%description -n libQt5Nfc5-imports
+Qt is a set of libraries for developing applications.
+
%package tools
Summary: Qt 5 Nfc Addon
Group: Development/Libraries/X11
@@ -140,12 +164,20 @@
%defattr(-,root,root,755)
%doc *.txt LICENSE.*
%{_libqt5_libdir}/libQt5Bluetooth.so.*
+
+%files -n %{libname}-imports
+%defattr(-,root,root,755)
+%doc *.txt LICENSE.*
%{_libqt5_archdatadir}/qml/QtBluetooth/
%files -n libQt5Nfc5
%defattr(-,root,root,755)
%doc *.txt LICENSE.*
%{_libqt5_libdir}/libQt5Nfc.so.*
+
+%files -n libQt5Nfc5-imports
+%defattr(-,root,root,755)
+%doc *.txt LICENSE.*
%{_libqt5_archdatadir}/qml/QtNfc/
%files private-headers-devel
++++++ qtconnectivity-opensource-src-5.4.0.tar.xz -> qtconnectivity-opensource-src-5.4.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/.qmake.conf new/qtconnectivity-opensource-src-5.4.1/.qmake.conf
--- old/qtconnectivity-opensource-src-5.4.0/.qmake.conf 2014-12-05 17:25:13.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/.qmake.conf 2015-02-17 05:57:29.000000000 +0100
@@ -1,4 +1,4 @@
load(qt_build_config)
CONFIG += qt_example_installs
-MODULE_VERSION = 5.4.0
+MODULE_VERSION = 5.4.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/.tag new/qtconnectivity-opensource-src-5.4.1/.tag
--- old/qtconnectivity-opensource-src-5.4.0/.tag 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/.tag 2015-02-17 05:57:30.000000000 +0100
@@ -1 +1 @@
-5d405d07fb51502d0bfab08f4d74aa5eba365bab
+9cc6a9b3af559004bbfdfec3aa7dd258bee1eb77
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/dist/changes-5.4.1 new/qtconnectivity-opensource-src-5.4.1/dist/changes-5.4.1
--- old/qtconnectivity-opensource-src-5.4.0/dist/changes-5.4.1 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/dist/changes-5.4.1 2015-02-17 05:57:29.000000000 +0100
@@ -0,0 +1,38 @@
+Qt 5.4.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.4.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+ http://doc.qt.io/qt-5.4
+
+The Qt version 5.4 series is binary compatible with the 5.3.x series.
+Applications compiled for 5.3 will continue to run with 5.4.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ http://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+QtBluetooth
+-----------
+
+ - General:
+ * Extended documentation with regards to Bluetooth Low Energy. The
+ affected classes were QLowEnergyController and QLowEnergyService.
+ * LowEnergyScanner and chat examples improved.
+
+ - QBluetoothServer:
+ * [QTBUG-43806] Fixed SDP registration of PublicBrowseGroup in BlueZ 5.x.
+
+ - QLowEnergyController:
+ * Fixed blocking of ATT command processing due to a reconnect to the target
+ device.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/btchat/chatserver.cpp new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/btchat/chatserver.cpp
--- old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/btchat/chatserver.cpp 2014-12-05 17:25:13.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/btchat/chatserver.cpp 2015-02-17 05:57:29.000000000 +0100
@@ -101,8 +101,10 @@
//! [Service UUID set]
//! [Service Discoverability]
+ QBluetoothServiceInfo::Sequence publicBrowse;
+ publicBrowse << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::PublicBrowseGroup));
serviceInfo.setAttribute(QBluetoothServiceInfo::BrowseGroupList,
- QBluetoothUuid(QBluetoothUuid::PublicBrowseGroup));
+ publicBrowse);
//! [Service Discoverability]
//! [Protocol descriptor list]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/btchat/main.cpp new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/btchat/main.cpp
--- old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/btchat/main.cpp 2014-12-05 17:25:13.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/btchat/main.cpp 2015-02-17 05:57:29.000000000 +0100
@@ -41,9 +41,11 @@
#include "chat.h"
#include <QApplication>
+//#include
int main(int argc, char *argv[])
{
+ //QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true"));
QApplication app(argc, argv);
Chat d;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/btchat/remoteselector.cpp new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/btchat/remoteselector.cpp
--- old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/btchat/remoteselector.cpp 2014-12-05 17:25:13.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/btchat/remoteselector.cpp 2015-02-17 05:57:29.000000000 +0100
@@ -136,6 +136,8 @@
{
qDebug() << "got click" << item->text();
m_service = m_discoveredServices.value(item);
+ if (m_discoveryAgent->isActive())
+ m_discoveryAgent->stop();
accept();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/chat/Search.qml new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/chat/Search.qml
--- old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/chat/Search.qml 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/chat/Search.qml 2015-02-17 05:57:29.000000000 +0100
@@ -41,7 +41,7 @@
import QtQuick 2.2
Rectangle {
- property bool animationRunning: ranimation.running
+ property bool animationRunning: true
function appendText(newText) {
searchText.text += newText
@@ -75,6 +75,7 @@
duration: 2000
loops: Animation.Infinite
alwaysRunToEnd: true
+ running: animationRunning
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/chat/chat.qml new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/chat/chat.qml
--- old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/chat/chat.qml 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/chat/chat.qml 2015-02-17 05:57:30.000000000 +0100
@@ -57,10 +57,18 @@
//! [BtDiscoveryModel-1]
onRunningChanged : {
if (!btModel.running && top.state == "begin" && !serviceFound) {
+ searchBox.animationRunning = false;
searchBox.appendText("\nNo service found. \n\nPlease start server\nand restart app.")
}
}
+ onErrorChanged: {
+ if (error != BluetoothDiscoveryModel.NoError && !btModel.running) {
+ searchBox.animationRunning = false
+ searchBox.appendText("\n\nDiscovery failed.\nPlease ensure Bluetooth is available.")
+ }
+ }
+
//! [BtDiscoveryModel-2]
onServiceDiscovered: {
if (serviceFound)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/chat/qmlchat.cpp new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/chat/qmlchat.cpp
--- old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/chat/qmlchat.cpp 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/chat/qmlchat.cpp 2015-02-17 05:57:30.000000000 +0100
@@ -43,11 +43,17 @@
#include
#include
#include <QDebug>
+#include <QBluetoothLocalDevice>
int main(int argc, char *argv[])
{
QGuiApplication application(argc, argv);
+ QList<QBluetoothHostInfo> infos = QBluetoothLocalDevice::allDevices();
+ if (infos.isEmpty())
+ qWarning() << "Missing Bluetooth local device. "
+ "Example will not work properly.";
+
const QString mainQmlApp = QLatin1String("qrc:/chat.qml");
QQuickView view;
view.setSource(QUrl(mainQmlApp));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/lowenergyscanner/assets/Characteristics.qml new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/lowenergyscanner/assets/Characteristics.qml
--- old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/lowenergyscanner/assets/Characteristics.qml 2014-12-05 17:25:13.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/lowenergyscanner/assets/Characteristics.qml 2015-02-17 05:57:29.000000000 +0100
@@ -141,10 +141,11 @@
id: menu
anchors.bottom: parent.bottom
menuWidth: parent.width
- menuText: "Scanning"
+ menuText: device.update
menuHeight: (parent.height/6)
onButtonClick: {
pageLoader.source = "Services.qml"
+ device.update = "Back"
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/lowenergyscanner/assets/Services.qml new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/lowenergyscanner/assets/Services.qml
--- old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/lowenergyscanner/assets/Services.qml 2014-12-05 17:25:13.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/lowenergyscanner/assets/Services.qml 2015-02-17 05:57:29.000000000 +0100
@@ -76,10 +76,6 @@
else
info.visible = false;
}
-
- onDisconnected: {
- pageLoader.source = "main.qml"
- }
}
ListView {
@@ -137,10 +133,12 @@
id: menu
anchors.bottom: parent.bottom
menuWidth: parent.width
- menuText: "Back"
+ menuText: device.update
menuHeight: (parent.height/6)
onButtonClick: {
device.disconnectFromDevice()
+ pageLoader.source = "main.qml"
+ device.update = "Search"
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/lowenergyscanner/device.cpp new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/lowenergyscanner/device.cpp
--- old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/lowenergyscanner/device.cpp 2014-12-05 17:25:13.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/lowenergyscanner/device.cpp 2015-02-17 05:57:29.000000000 +0100
@@ -155,7 +155,7 @@
m_services.clear();
emit servicesUpdated();
- setUpdate("Connecting to device...");
+ setUpdate("Back\n(Connecting to device...)");
if (controller && controller->remoteAddress() != currentDevice.getDevice().address()) {
controller->disconnectFromDevice();
@@ -205,7 +205,7 @@
void Device::serviceScanDone()
{
- setUpdate("Service scan done!");
+ setUpdate("Back\n(Service scan done!)");
// force UI in case we didn't find anything
if (m_services.isEmpty())
emit servicesUpdated();
@@ -234,6 +234,7 @@
connect(service, SIGNAL(stateChanged(QLowEnergyService::ServiceState)),
this, SLOT(serviceDetailsDiscovered(QLowEnergyService::ServiceState)));
service->discoverDetails();
+ setUpdate("Back\n(Discovering details...)");
//! [les-service-3]
return;
}
@@ -250,7 +251,7 @@
void Device::deviceConnected()
{
- setUpdate("Discovering services!");
+ setUpdate("Back\n(Discovering services...)");
connected = true;
//! [les-service-2]
controller->discoverServices();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/lowenergyscanner/device.h new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/lowenergyscanner/device.h
--- old/qtconnectivity-opensource-src-5.4.0/examples/bluetooth/lowenergyscanner/device.h 2014-12-05 17:25:13.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/examples/bluetooth/lowenergyscanner/device.h 2015-02-17 05:57:29.000000000 +0100
@@ -63,7 +63,7 @@
Q_PROPERTY(QVariant devicesList READ getDevices NOTIFY devicesUpdated)
Q_PROPERTY(QVariant servicesList READ getServices NOTIFY servicesUpdated)
Q_PROPERTY(QVariant characteristicList READ getCharacteristics NOTIFY characteristicsUpdated)
- Q_PROPERTY(QString update READ getUpdate NOTIFY updateChanged)
+ Q_PROPERTY(QString update READ getUpdate WRITE setUpdate NOTIFY updateChanged)
Q_PROPERTY(bool useRandomAddress READ isRandomAddress WRITE setRandomAddress NOTIFY randomAddressChanged)
Q_PROPERTY(bool state READ state NOTIFY stateChanged)
Q_PROPERTY(bool controllerError READ hasControllerError)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/adapter1_bluez5_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/adapter1_bluez5_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/adapter1_bluez5_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/adapter1_bluez5_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/adapter1_bluez5_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/adapter_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/adapter_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/adapter_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/adapter_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/adapter_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/agent_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/agent_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/agent_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/agent_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/agent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/androidbroadcastreceiver_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/androidbroadcastreceiver_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/androidbroadcastreceiver_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/androidbroadcastreceiver_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/android/androidbroadcastreceiver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/bluez5_helper_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/bluez5_helper_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/bluez5_helper_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/bluez5_helper_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/bluez5_helper_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/bluez_data_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/bluez_data_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/bluez_data_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/bluez_data_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/bluez_data_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/device1_bluez5_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/device1_bluez5_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/device1_bluez5_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/device1_bluez5_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/device1_bluez5_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/device_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/device_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/device_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/device_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/device_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/android/devicediscoverybroadcastreceiver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/hcimanager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/hcimanager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/hcimanager_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/hcimanager_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/hcimanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/inputstreamthread_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/inputstreamthread_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/inputstreamthread_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/inputstreamthread_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/android/inputstreamthread_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/jni_android_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/jni_android_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/jni_android_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/jni_android_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/android/jni_android_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/localdevicebroadcastreceiver_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/localdevicebroadcastreceiver_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/localdevicebroadcastreceiver_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/localdevicebroadcastreceiver_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/android/localdevicebroadcastreceiver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/manager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/manager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/manager_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/manager_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/manager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_agent_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_agent_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_agent_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_agent_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/obex_agent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_client1_bluez5_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_client1_bluez5_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_client1_bluez5_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_client1_bluez5_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/obex_client1_bluez5_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_client_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_client_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_client_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_client_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/obex_client_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_manager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_manager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_manager_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_manager_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/obex_manager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_objectpush1_bluez5_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_objectpush1_bluez5_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_objectpush1_bluez5_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_objectpush1_bluez5_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/obex_objectpush1_bluez5_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_transfer1_bluez5_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_transfer1_bluez5_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_transfer1_bluez5_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_transfer1_bluez5_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/obex_transfer1_bluez5_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_transfer_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_transfer_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_transfer_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/obex_transfer_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/obex_transfer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/objectmanager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/objectmanager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/objectmanager_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/objectmanager_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/objectmanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/ppshelpers_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/ppshelpers_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/ppshelpers_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/ppshelpers_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qnx/ppshelpers_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/profile1_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/profile1_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/profile1_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/profile1_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/profile1_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/properties_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/properties_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/properties_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/properties_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/properties_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothaddress_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothaddress_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothaddress_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothaddress_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qbluetoothaddress_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothdevicediscoveryagent_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothdevicediscoveryagent_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothdevicediscoveryagent_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothdevicediscoveryagent_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qbluetoothdevicediscoveryagent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothdeviceinfo_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothdeviceinfo_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothdeviceinfo_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothdeviceinfo_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qbluetoothdeviceinfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothhostinfo_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothhostinfo_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothhostinfo_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothhostinfo_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qbluetoothhostinfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothlocaldevice_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothlocaldevice_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothlocaldevice_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothlocaldevice_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qbluetoothlocaldevice_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothserver_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothserver_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothserver_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothserver_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qbluetoothserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothservicediscoveryagent_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothservicediscoveryagent_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothservicediscoveryagent_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothservicediscoveryagent_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qbluetoothservicediscoveryagent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothserviceinfo_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothserviceinfo_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothserviceinfo_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothserviceinfo_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qbluetoothserviceinfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothsocket_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothsocket_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothsocket_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothsocket_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qbluetoothsocket_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferreply_bluez_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferreply_bluez_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferreply_bluez_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferreply_bluez_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qbluetoothtransferreply_bluez_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferreply_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferreply_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferreply_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferreply_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qbluetoothtransferreply_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferreply_qnx_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferreply_qnx_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferreply_qnx_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferreply_qnx_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qbluetoothtransferreply_qnx_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferrequest_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferrequest_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferrequest_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qbluetoothtransferrequest_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qbluetoothtransferrequest_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qlowenergycontroller_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qlowenergycontroller_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qlowenergycontroller_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qlowenergycontroller_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qlowenergycontroller_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qlowenergyserviceprivate_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qlowenergyserviceprivate_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qlowenergyserviceprivate_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qlowenergyserviceprivate_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qlowenergyserviceprivate_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qprivatelinearbuffer_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qprivatelinearbuffer_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/qprivatelinearbuffer_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/qprivatelinearbuffer_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/qprivatelinearbuffer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/serveracceptancethread_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/serveracceptancethread_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/serveracceptancethread_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/serveracceptancethread_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/android/serveracceptancethread_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/service_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/service_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/service_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/service_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/service_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/servicediscoverybroadcastreceiver_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/servicediscoverybroadcastreceiver_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/servicediscoverybroadcastreceiver_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/servicediscoverybroadcastreceiver_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/android/servicediscoverybroadcastreceiver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/servicemap_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/servicemap_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.0/QtBluetooth/private/servicemap_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.0/QtBluetooth/private/servicemap_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/bluetooth/bluez/servicemap_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/adapter1_bluez5_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/adapter1_bluez5_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/adapter1_bluez5_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/adapter1_bluez5_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/adapter1_bluez5_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/adapter_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/adapter_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/adapter_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/adapter_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/adapter_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/agent_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/agent_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/agent_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/agent_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/agent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/androidbroadcastreceiver_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/androidbroadcastreceiver_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/androidbroadcastreceiver_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/androidbroadcastreceiver_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/android/androidbroadcastreceiver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/bluez5_helper_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/bluez5_helper_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/bluez5_helper_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/bluez5_helper_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/bluez5_helper_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/bluez_data_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/bluez_data_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/bluez_data_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/bluez_data_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/bluez_data_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/device1_bluez5_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/device1_bluez5_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/device1_bluez5_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/device1_bluez5_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/device1_bluez5_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/device_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/device_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/device_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/device_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/device_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/android/devicediscoverybroadcastreceiver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/hcimanager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/hcimanager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/hcimanager_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/hcimanager_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/hcimanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/inputstreamthread_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/inputstreamthread_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/inputstreamthread_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/inputstreamthread_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/android/inputstreamthread_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/jni_android_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/jni_android_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/jni_android_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/jni_android_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/android/jni_android_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/localdevicebroadcastreceiver_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/localdevicebroadcastreceiver_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/localdevicebroadcastreceiver_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/localdevicebroadcastreceiver_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/android/localdevicebroadcastreceiver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/manager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/manager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/manager_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/manager_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/manager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_agent_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_agent_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_agent_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_agent_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/obex_agent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_client1_bluez5_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_client1_bluez5_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_client1_bluez5_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_client1_bluez5_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/obex_client1_bluez5_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_client_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_client_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_client_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_client_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/obex_client_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_manager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_manager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_manager_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_manager_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/obex_manager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_objectpush1_bluez5_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_objectpush1_bluez5_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_objectpush1_bluez5_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_objectpush1_bluez5_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/obex_objectpush1_bluez5_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_transfer1_bluez5_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_transfer1_bluez5_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_transfer1_bluez5_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_transfer1_bluez5_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/obex_transfer1_bluez5_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_transfer_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_transfer_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_transfer_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/obex_transfer_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/obex_transfer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/objectmanager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/objectmanager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/objectmanager_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/objectmanager_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/objectmanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/ppshelpers_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/ppshelpers_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/ppshelpers_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/ppshelpers_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qnx/ppshelpers_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/profile1_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/profile1_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/profile1_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/profile1_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/profile1_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/properties_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/properties_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/properties_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/properties_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/properties_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothaddress_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothaddress_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothaddress_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothaddress_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qbluetoothaddress_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothdevicediscoveryagent_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothdevicediscoveryagent_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothdevicediscoveryagent_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothdevicediscoveryagent_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qbluetoothdevicediscoveryagent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothdeviceinfo_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothdeviceinfo_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothdeviceinfo_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothdeviceinfo_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qbluetoothdeviceinfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothhostinfo_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothhostinfo_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothhostinfo_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothhostinfo_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qbluetoothhostinfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothlocaldevice_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothlocaldevice_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothlocaldevice_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothlocaldevice_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qbluetoothlocaldevice_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothserver_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothserver_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothserver_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothserver_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qbluetoothserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothservicediscoveryagent_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothservicediscoveryagent_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothservicediscoveryagent_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothservicediscoveryagent_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qbluetoothservicediscoveryagent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothserviceinfo_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothserviceinfo_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothserviceinfo_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothserviceinfo_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qbluetoothserviceinfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothsocket_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothsocket_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothsocket_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothsocket_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qbluetoothsocket_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferreply_bluez_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferreply_bluez_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferreply_bluez_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferreply_bluez_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qbluetoothtransferreply_bluez_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferreply_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferreply_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferreply_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferreply_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qbluetoothtransferreply_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferreply_qnx_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferreply_qnx_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferreply_qnx_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferreply_qnx_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qbluetoothtransferreply_qnx_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferrequest_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferrequest_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferrequest_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qbluetoothtransferrequest_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qbluetoothtransferrequest_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qlowenergycontroller_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qlowenergycontroller_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qlowenergycontroller_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qlowenergycontroller_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qlowenergycontroller_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qlowenergyserviceprivate_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qlowenergyserviceprivate_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qlowenergyserviceprivate_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qlowenergyserviceprivate_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qlowenergyserviceprivate_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qprivatelinearbuffer_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qprivatelinearbuffer_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/qprivatelinearbuffer_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/qprivatelinearbuffer_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/qprivatelinearbuffer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/serveracceptancethread_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/serveracceptancethread_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/serveracceptancethread_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/serveracceptancethread_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/android/serveracceptancethread_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/service_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/service_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/service_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/service_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/service_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/servicediscoverybroadcastreceiver_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/servicediscoverybroadcastreceiver_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/servicediscoverybroadcastreceiver_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/servicediscoverybroadcastreceiver_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/android/servicediscoverybroadcastreceiver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/servicemap_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/servicemap_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/5.4.1/QtBluetooth/private/servicemap_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/5.4.1/QtBluetooth/private/servicemap_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/bluetooth/bluez/servicemap_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/qtbluetoothversion.h new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/qtbluetoothversion.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtBluetooth/qtbluetoothversion.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtBluetooth/qtbluetoothversion.h 2015-02-17 05:57:30.000000000 +0100
@@ -2,8 +2,8 @@
#ifndef QT_QTBLUETOOTH_VERSION_H
#define QT_QTBLUETOOTH_VERSION_H
-#define QTBLUETOOTH_VERSION_STR "5.4.0"
+#define QTBLUETOOTH_VERSION_STR "5.4.1"
-#define QTBLUETOOTH_VERSION 0x050400
+#define QTBLUETOOTH_VERSION 0x050401
#endif // QT_QTBLUETOOTH_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qllcpserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_p_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_p_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_p_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qllcpserver_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_qnx_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_qnx_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_qnx_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_qnx_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qllcpserver_qnx_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_simulator_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_simulator_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_simulator_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpserver_simulator_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qllcpserver_simulator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qllcpsocket_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_p_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_p_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_p_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_p_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qllcpsocket_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_qnx_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_qnx_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_qnx_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_qnx_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qllcpsocket_qnx_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_simulator_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_simulator_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_simulator_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qllcpsocket_simulator_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qllcpsocket_simulator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qndefnfcsmartposterrecord_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qndefnfcsmartposterrecord_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qndefnfcsmartposterrecord_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qndefnfcsmartposterrecord_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qndefnfcsmartposterrecord_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qndefrecord_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qndefrecord_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qndefrecord_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qndefrecord_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qndefrecord_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_emulator_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_emulator_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_emulator_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_emulator_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldmanager_emulator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldmanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_qnx_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_qnx_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_qnx_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_qnx_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldmanager_qnx_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_simulator_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_simulator_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_simulator_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanager_simulator_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldmanager_simulator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanagerimpl_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanagerimpl_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanagerimpl_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanagerimpl_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldmanagerimpl_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanagervirtualbase_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanagervirtualbase_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanagervirtualbase_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldmanagervirtualbase_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldmanagervirtualbase_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharemanager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharemanager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharemanager_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharemanager_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldsharemanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharemanager_qnx_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharemanager_qnx_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharemanager_qnx_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharemanager_qnx_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldsharemanager_qnx_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharemanagerimpl_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharemanagerimpl_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharemanagerimpl_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharemanagerimpl_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldsharemanagerimpl_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharetarget_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharetarget_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharetarget_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharetarget_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldsharetarget_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharetarget_qnx_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharetarget_qnx_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharetarget_qnx_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharetarget_qnx_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldsharetarget_qnx_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharetargetimpl_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharetargetimpl_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharetargetimpl_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldsharetargetimpl_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldsharetargetimpl_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype1_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype1_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype1_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype1_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldtagtype1_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype2_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype2_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype2_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype2_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldtagtype2_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype3_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype3_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype3_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype3_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldtagtype3_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype4_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype4_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype4_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtagtype4_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldtagtype4_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtarget_emulator_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtarget_emulator_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtarget_emulator_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtarget_emulator_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldtarget_emulator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtarget_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtarget_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtarget_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtarget_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldtarget_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtarget_qnx_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtarget_qnx_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtarget_qnx_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnearfieldtarget_qnx_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnearfieldtarget_qnx_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnxnfceventfilter_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnxnfceventfilter_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnxnfceventfilter_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnxnfceventfilter_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnx/qnxnfceventfilter_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnxnfcmanager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnxnfcmanager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnxnfcmanager_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnxnfcmanager_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnx/qnxnfcmanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnxnfcsharemanager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnxnfcsharemanager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qnxnfcsharemanager_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qnxnfcsharemanager_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qnx/qnxnfcsharemanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qtlv_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qtlv_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/qtlv_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/qtlv_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/qtlv_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/targetemulator_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/targetemulator_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.0/QtNfc/private/targetemulator_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.0/QtNfc/private/targetemulator_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/nfc/targetemulator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qllcpserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_p_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_p_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_p_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_p_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qllcpserver_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_qnx_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_qnx_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_qnx_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_qnx_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qllcpserver_qnx_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_simulator_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_simulator_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_simulator_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpserver_simulator_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qllcpserver_simulator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qllcpsocket_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_p_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_p_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_p_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_p_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qllcpsocket_p_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_qnx_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_qnx_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_qnx_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_qnx_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qllcpsocket_qnx_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_simulator_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_simulator_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_simulator_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qllcpsocket_simulator_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qllcpsocket_simulator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qndefnfcsmartposterrecord_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qndefnfcsmartposterrecord_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qndefnfcsmartposterrecord_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qndefnfcsmartposterrecord_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qndefnfcsmartposterrecord_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qndefrecord_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qndefrecord_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qndefrecord_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qndefrecord_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qndefrecord_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_emulator_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_emulator_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_emulator_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_emulator_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldmanager_emulator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldmanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_qnx_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_qnx_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_qnx_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_qnx_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldmanager_qnx_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_simulator_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_simulator_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_simulator_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanager_simulator_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldmanager_simulator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanagerimpl_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanagerimpl_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanagerimpl_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanagerimpl_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldmanagerimpl_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanagervirtualbase_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanagervirtualbase_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanagervirtualbase_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldmanagervirtualbase_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldmanagervirtualbase_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharemanager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharemanager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharemanager_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharemanager_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldsharemanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharemanager_qnx_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharemanager_qnx_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharemanager_qnx_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharemanager_qnx_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldsharemanager_qnx_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharemanagerimpl_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharemanagerimpl_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharemanagerimpl_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharemanagerimpl_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldsharemanagerimpl_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharetarget_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharetarget_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharetarget_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharetarget_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldsharetarget_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharetarget_qnx_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharetarget_qnx_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharetarget_qnx_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharetarget_qnx_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldsharetarget_qnx_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharetargetimpl_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharetargetimpl_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharetargetimpl_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldsharetargetimpl_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldsharetargetimpl_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype1_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype1_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype1_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype1_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldtagtype1_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype2_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype2_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype2_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype2_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldtagtype2_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype3_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype3_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype3_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype3_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldtagtype3_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype4_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype4_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype4_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtagtype4_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldtagtype4_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtarget_emulator_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtarget_emulator_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtarget_emulator_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtarget_emulator_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldtarget_emulator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtarget_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtarget_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtarget_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtarget_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldtarget_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtarget_qnx_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtarget_qnx_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtarget_qnx_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnearfieldtarget_qnx_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnearfieldtarget_qnx_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnxnfceventfilter_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnxnfceventfilter_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnxnfceventfilter_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnxnfceventfilter_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnx/qnxnfceventfilter_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnxnfcmanager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnxnfcmanager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnxnfcmanager_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnxnfcmanager_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnx/qnxnfcmanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnxnfcsharemanager_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnxnfcsharemanager_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qnxnfcsharemanager_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qnxnfcsharemanager_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qnx/qnxnfcsharemanager_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qtlv_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qtlv_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/qtlv_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/qtlv_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/qtlv_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/targetemulator_p.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/targetemulator_p.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/5.4.1/QtNfc/private/targetemulator_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/5.4.1/QtNfc/private/targetemulator_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/nfc/targetemulator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/qtnfcversion.h new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/qtnfcversion.h
--- old/qtconnectivity-opensource-src-5.4.0/include/QtNfc/qtnfcversion.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/include/QtNfc/qtnfcversion.h 2015-02-17 05:57:30.000000000 +0100
@@ -2,8 +2,8 @@
#ifndef QT_QTNFC_VERSION_H
#define QT_QTNFC_VERSION_H
-#define QTNFC_VERSION_STR "5.4.0"
+#define QTNFC_VERSION_STR "5.4.1"
-#define QTNFC_VERSION 0x050400
+#define QTNFC_VERSION 0x050401
#endif // QT_QTNFC_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/bluez/hcimanager.cpp new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/bluez/hcimanager.cpp
--- old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/bluez/hcimanager.cpp 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/bluez/hcimanager.cpp 2015-02-17 05:57:30.000000000 +0100
@@ -150,6 +150,7 @@
return false;
// this event is already enabled
+ // TODO runningEvents does not seem to be used
if (runningEvents.contains(event))
return true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/doc/src/bluetooth-le-overview.qdoc new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/doc/src/bluetooth-le-overview.qdoc
--- old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/doc/src/bluetooth-le-overview.qdoc 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/doc/src/bluetooth-le-overview.qdoc 2015-02-17 05:57:30.000000000 +0100
@@ -172,8 +172,7 @@
\l {heartlistener}{Heart Listener} example.
\note As of Qt 5.4 the Qt Bluetooth Low Energy API is in tech preview mode and supports Linux
- with BlueZ 4 & 5. Only the last versions of Bluez 4.x (v 4.101 confirmed to work) and Linux kernels
- from version 3.5 onwards support this feature.
+ with BlueZ 4.101 & 5.x. The minimal Linux kernel version is 3.5.
\section2 Establishing a Connection
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qbluetoothserver.cpp new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qbluetoothserver.cpp
--- old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qbluetoothserver.cpp 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qbluetoothserver.cpp 2015-02-17 05:57:30.000000000 +0100
@@ -204,8 +204,10 @@
//! [listen]
QBluetoothServiceInfo serviceInfo;
serviceInfo.setAttribute(QBluetoothServiceInfo::ServiceName, serviceName);
+ QBluetoothServiceInfo::Sequence browseSequence;
+ browseSequence << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::PublicBrowseGroup));
serviceInfo.setAttribute(QBluetoothServiceInfo::BrowseGroupList,
- QBluetoothUuid(QBluetoothUuid::PublicBrowseGroup));
+ browseSequence);
QBluetoothServiceInfo::Sequence classId;
classId << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::SerialPort));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qbluetoothservicediscoveryagent.cpp new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qbluetoothservicediscoveryagent.cpp
--- old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qbluetoothservicediscoveryagent.cpp 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qbluetoothservicediscoveryagent.cpp 2015-02-17 05:57:30.000000000 +0100
@@ -183,6 +183,11 @@
QBluetoothServiceDiscoveryAgent::~QBluetoothServiceDiscoveryAgent()
{
+ if (isActive()) {
+ disconnect(); //don't emit any signals due to stop()
+ stop();
+ }
+
delete d_ptr;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qbluetoothservicediscoveryagent.h new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qbluetoothservicediscoveryagent.h
--- old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qbluetoothservicediscoveryagent.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qbluetoothservicediscoveryagent.h 2015-02-17 05:57:30.000000000 +0100
@@ -42,6 +42,10 @@
#include
#include
+#ifdef QT_BLUEZ_BLUETOOTH
+#include
+#endif
+
QT_BEGIN_NAMESPACE
class QBluetoothAddress;
@@ -106,7 +110,7 @@
#ifdef QT_BLUEZ_BLUETOOTH
Q_PRIVATE_SLOT(d_func(), void _q_discoveredServices(QDBusPendingCallWatcher*))
Q_PRIVATE_SLOT(d_func(), void _q_createdDevice(QDBusPendingCallWatcher*))
- Q_PRIVATE_SLOT(d_func(), void _q_finishSdpScan(QBluetoothServiceDiscoveryAgent::Error, const QString &, const QStringList &))
+ Q_PRIVATE_SLOT(d_func(), void _q_sdpScannerDone(int,QProcess::ExitStatus))
#endif
#ifdef QT_ANDROID_BLUETOOTH
Q_PRIVATE_SLOT(d_func(), void _q_processFetchedUuids(const QBluetoothAddress &address,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
--- old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp 2015-02-17 05:57:30.000000000 +0100
@@ -65,7 +65,7 @@
QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(const QBluetoothAddress &deviceAdapter)
: error(QBluetoothServiceDiscoveryAgent::NoError), m_deviceAdapterAddress(deviceAdapter), state(Inactive), deviceDiscoveryAgent(0),
mode(QBluetoothServiceDiscoveryAgent::MinimalDiscovery), singleDevice(false),
- manager(0), managerBluez5(0), adapter(0), device(0)
+ manager(0), managerBluez5(0), adapter(0), device(0), sdpScannerProcess(0)
{
if (isBluez5()) {
managerBluez5 = new OrgFreedesktopDBusObjectManagerInterface(
@@ -136,6 +136,7 @@
}
+// Bluez 5
void QBluetoothServiceDiscoveryAgentPrivate::startBluez5(const QBluetoothAddress &address)
{
Q_Q(QBluetoothServiceDiscoveryAgent);
@@ -185,81 +186,64 @@
if (DiscoveryMode() == QBluetoothServiceDiscoveryAgent::MinimalDiscovery) {
performMinimalServiceDiscovery(address);
} else {
- // we need to run the discovery in a different thread
- // as it involves blocking calls
- QtConcurrent::run(this, &QBluetoothServiceDiscoveryAgentPrivate::runSdpScan,
- address, QBluetoothAddress(adapter.address()));
+ runExternalSdpScan(address, QBluetoothAddress(adapter.address()));
}
}
-/*
- * This function runs in a different thread. We need to be very careful what we
- * access from here. That's why invokeMethod is used below.
- *
+/* Bluez 5
* src/tools/sdpscanner performs an SDP scan. This is
* done out-of-process to avoid license issues. At this stage Bluez uses GPLv2.
*/
-void QBluetoothServiceDiscoveryAgentPrivate::runSdpScan(
+void QBluetoothServiceDiscoveryAgentPrivate::runExternalSdpScan(
const QBluetoothAddress &remoteAddress, const QBluetoothAddress localAddress)
{
Q_Q(QBluetoothServiceDiscoveryAgent);
- const QString binPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
+ if (!sdpScannerProcess) {
+ const QString binPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
+ QFileInfo fileInfo(binPath, QStringLiteral("sdpscanner"));
+ if (!fileInfo.exists() || !fileInfo.isExecutable()) {
+ _q_finishSdpScan(QBluetoothServiceDiscoveryAgent::InputOutputError,
+ QBluetoothServiceDiscoveryAgent::tr("Unable to find sdpscanner"),
+ QStringList());
+ qCWarning(QT_BT_BLUEZ) << "Cannot find sdpscanner:"
+ << fileInfo.canonicalFilePath();
+ return;
+ }
+
+ sdpScannerProcess = new QProcess(q);
+ sdpScannerProcess->setReadChannel(QProcess::StandardOutput);
+ sdpScannerProcess->setProgram(fileInfo.canonicalFilePath());
+ q->connect(sdpScannerProcess, SIGNAL(finished(int,QProcess::ExitStatus)),
+ q, SLOT(_q_sdpScannerDone(int,QProcess::ExitStatus)));
- QFileInfo fileInfo(binPath, QStringLiteral("sdpscanner"));
- if (!fileInfo.exists() || !fileInfo.isExecutable()) {
- QMetaObject::invokeMethod(q, "_q_finishSdpScan", Qt::QueuedConnection,
- Q_ARG(QBluetoothServiceDiscoveryAgent::Error,
- QBluetoothServiceDiscoveryAgent::InputOutputError),
- Q_ARG(QString,
- QBluetoothServiceDiscoveryAgent::tr("Unable to find sdpscanner")),
- Q_ARG(QStringList, QStringList()));
- qCWarning(QT_BT_BLUEZ) << "Cannot find sdpscanner:"
- << fileInfo.canonicalFilePath();
- return;
}
QStringList arguments;
arguments << remoteAddress.toString() << localAddress.toString();
- QByteArray output;
-
- QProcess process;
- process.setProcessChannelMode(QProcess::ForwardedErrorChannel);
- process.setReadChannel(QProcess::StandardOutput);
- process.start(fileInfo.canonicalFilePath(), arguments);
-
- if (process.waitForStarted(-1)) {
- while (process.waitForReadyRead(-1))
- output += process.readAllStandardOutput();
- }
-
- process.waitForFinished();
+ sdpScannerProcess->setArguments(arguments);
+ sdpScannerProcess->start();
+}
- if (process.exitStatus() != QProcess::NormalExit
- || process.exitCode() != 0) {
- qCWarning(QT_BT_BLUEZ) << "SDP scan failure"
- << process.exitStatus() << process.exitCode()
- << remoteAddress;
+// Bluez 5
+void QBluetoothServiceDiscoveryAgentPrivate::_q_sdpScannerDone(int exitCode, QProcess::ExitStatus status)
+{
+ if (status != QProcess::NormalExit || exitCode != 0) {
+ qCWarning(QT_BT_BLUEZ) << "SDP scan failure" << status << exitCode;
if (singleDevice) {
- QMetaObject::invokeMethod(q, "_q_finishSdpScan", Qt::QueuedConnection,
- Q_ARG(QBluetoothServiceDiscoveryAgent::Error,
- QBluetoothServiceDiscoveryAgent::InputOutputError),
- Q_ARG(QString,
- QBluetoothServiceDiscoveryAgent::tr("Unable to perform SDP scan")),
- Q_ARG(QStringList, QStringList()));
+ _q_finishSdpScan(QBluetoothServiceDiscoveryAgent::InputOutputError,
+ QBluetoothServiceDiscoveryAgent::tr("Unable to perform SDP scan"),
+ QStringList());
} else {
// go to next device
- QMetaObject::invokeMethod(q, "_q_finishSdpScan", Qt::QueuedConnection,
- Q_ARG(QBluetoothServiceDiscoveryAgent::Error,
- QBluetoothServiceDiscoveryAgent::NoError),
- Q_ARG(QString, QString()),
- Q_ARG(QStringList, QStringList()));
+ _q_finishSdpScan(QBluetoothServiceDiscoveryAgent::NoError, QString(), QStringList());
}
return;
}
QStringList xmlRecords;
+ const QByteArray output = sdpScannerProcess->readAllStandardOutput();
const QString decodedData = QString::fromUtf8(QByteArray::fromBase64(output));
// split the various xml docs up
@@ -276,13 +260,10 @@
} while ( start != -1);
}
- QMetaObject::invokeMethod(q, "_q_finishSdpScan", Qt::QueuedConnection,
- Q_ARG(QBluetoothServiceDiscoveryAgent::Error,
- QBluetoothServiceDiscoveryAgent::NoError),
- Q_ARG(QString, QString()),
- Q_ARG(QStringList, xmlRecords));
+ _q_finishSdpScan(QBluetoothServiceDiscoveryAgent::NoError, QString(), xmlRecords);
}
+// Bluez 5
void QBluetoothServiceDiscoveryAgentPrivate::_q_finishSdpScan(QBluetoothServiceDiscoveryAgent::Error errorCode,
const QString &errorDescription,
const QStringList &xmlRecords)
@@ -352,8 +333,19 @@
Q_ASSERT(!device);
}
+
discoveredDevices.clear();
setDiscoveryState(Inactive);
+
+ // must happen after discoveredDevices.clear() above to avoid retrigger of next scan
+ // while waitForFinished() is waiting
+ if (sdpScannerProcess) { // Bluez 5
+ if (sdpScannerProcess->state() != QProcess::NotRunning) {
+ sdpScannerProcess->kill();
+ sdpScannerProcess->waitForFinished();
+ }
+ }
+
Q_Q(QBluetoothServiceDiscoveryAgent);
emit q->canceled();
}
@@ -591,6 +583,7 @@
return serviceInfo;
}
+// Bluez 5
void QBluetoothServiceDiscoveryAgentPrivate::performMinimalServiceDiscovery(const QBluetoothAddress &deviceAddress)
{
if (foundHostAdapterPath.isEmpty()) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qbluetoothservicediscoveryagent_p.h new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qbluetoothservicediscoveryagent_p.h
--- old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qbluetoothservicediscoveryagent_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qbluetoothservicediscoveryagent_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -58,6 +58,7 @@
class OrgBluezAdapterInterface;
class OrgBluezDeviceInterface;
class OrgFreedesktopDBusObjectManagerInterface;
+#include
QT_BEGIN_NAMESPACE
class QDBusPendingCallWatcher;
@@ -127,6 +128,7 @@
void _q_discoverGattCharacteristics(QDBusPendingCallWatcher *watcher);
void _q_discoveredGattCharacteristic(QDBusPendingCallWatcher *watcher);
*/
+ void _q_sdpScannerDone(int exitCode, QProcess::ExitStatus status);
void _q_finishSdpScan(QBluetoothServiceDiscoveryAgent::Error errorCode,
const QString &errorDescription,
const QStringList &xmlRecords);
@@ -147,8 +149,9 @@
#ifdef QT_BLUEZ_BLUETOOTH
void startBluez5(const QBluetoothAddress &address);
- void runSdpScan(const QBluetoothAddress &remoteAddress,
+ void runExternalSdpScan(const QBluetoothAddress &remoteAddress,
const QBluetoothAddress localAddress);
+ void sdpScannerDone(int exitCode, QProcess::ExitStatus exitStatus);
QVariant readAttributeValue(QXmlStreamReader &xml);
QBluetoothServiceInfo parseServiceXml(const QString& xml);
void performMinimalServiceDiscovery(const QBluetoothAddress &deviceAddress);
@@ -195,6 +198,7 @@
OrgFreedesktopDBusObjectManagerInterface *managerBluez5;
OrgBluezAdapterInterface *adapter;
OrgBluezDeviceInterface *device;
+ QProcess *sdpScannerProcess;
#endif
#ifdef QT_ANDROID_BLUETOOTH
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qlowenergycontroller.cpp new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qlowenergycontroller.cpp
--- old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qlowenergycontroller.cpp 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qlowenergycontroller.cpp 2015-02-17 05:57:30.000000000 +0100
@@ -475,7 +475,7 @@
Connects to the remote Bluetooth Low Energy device.
This function does nothing if the controller's \l state()
- is \l UnconnectedState. The \l connected() signal is emitted
+ is not equal to \l UnconnectedState. The \l connected() signal is emitted
once the connection is successfully established.
\sa disconnectFromDevice()
@@ -503,6 +503,8 @@
Once any of those objects become invalid they remain invalid even if this
controller object reconnects.
+ This function does nothing if the controller is in the \l UnconnectedState.
+
\sa connectToDevice()
*/
void QLowEnergyController::disconnectFromDevice()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qlowenergycontroller_bluez.cpp new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qlowenergycontroller_bluez.cpp
--- old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qlowenergycontroller_bluez.cpp 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qlowenergycontroller_bluez.cpp 2015-02-17 05:57:30.000000000 +0100
@@ -271,6 +271,7 @@
{
setState(QLowEnergyController::ClosingState);
l2cpSocket->close();
+ resetController();
}
void QLowEnergyControllerPrivate::l2cpDisconnected()
@@ -306,9 +307,19 @@
}
invalidateServices();
+ resetController();
setState(QLowEnergyController::UnconnectedState);
}
+
+void QLowEnergyControllerPrivate::resetController()
+{
+ openRequests.clear();
+ requestPending = false;
+ encryptionChangePending = false;
+ securityLevelValue = -1;
+}
+
void QLowEnergyControllerPrivate::l2cpReadyRead()
{
const QByteArray reply = l2cpSocket->readAll();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qlowenergycontroller_p.h new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qlowenergycontroller_p.h
--- old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qlowenergycontroller_p.h 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qlowenergycontroller_p.h 2015-02-17 05:57:30.000000000 +0100
@@ -160,6 +160,8 @@
const QByteArray &newValue, quint16 offset);
bool increaseEncryptLevelfRequired(quint8 errorCode);
+ void resetController();
+
private slots:
void l2cpConnected();
void l2cpDisconnected();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qlowenergyservice.cpp new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qlowenergyservice.cpp
--- old/qtconnectivity-opensource-src-5.4.0/src/bluetooth/qlowenergyservice.cpp 2014-12-05 17:25:14.000000000 +0100
+++ new/qtconnectivity-opensource-src-5.4.1/src/bluetooth/qlowenergyservice.cpp 2015-02-17 05:57:30.000000000 +0100
@@ -149,6 +149,9 @@
to be a secondary service. Each service may be included
by another service which is indicated by IncludedService.
\value IncludedService The service is included by another service.
+ On some platforms, this flag cannot be determined until
+ the service that includes the current service was
+ discovered.
*/
/*!
@@ -306,6 +309,9 @@
Returns the UUIDs of all services which are included by the
current service.
+ The returned list is empty if this service instance's \l discoverDetails()
+ was not yet called or there are no known characteristics.
+
It is possible that an included service contains yet another service. Such
second level includes have to be obtained via their relevant first level
QLowEnergyService instance. Technically, this could create
@@ -331,7 +337,6 @@
Therefore any service object instance created after
the first one has a state equal to already existing instances.
-
A service becomes invalid if the \l QLowEnergyController disconnects
from the remote device. An invalid service retains its internal state
at the time of the disconnect event. This implies that once the service
@@ -353,6 +358,11 @@
/*!
Returns the type of the service.
+
+ \note The type attribute cannot be relied upon until the service has
+ reached the \l ServiceDiscovered state. This field is initialised
+ with \l PrimaryService.
+
*/
QLowEnergyService::ServiceTypes QLowEnergyService::type() const
{
@@ -363,6 +373,9 @@
Returns the matching characteristic for \a uuid; otherwise an invalid
characteristic.
+ The returned characteristic is invalid if this service instance's \l discoverDetails()
+ was not yet called or there are no characteristics with a matching \a uuid.
+
\sa characteristics()
*/
QLowEnergyCharacteristic QLowEnergyService::characteristic(const QBluetoothUuid &uuid) const
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org