casa-mp-base

--- src/connectivity/bluetooth/bluetooth.pri    2011-05-10 10:06:10.000000000 +0200

+++ src/connectivity/bluetooth/bluetooth.pri    2011-08-10 15:44:24.000000000 +0200

@@ -103,6 +103,7 @@

     }

 } else:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) {

     QT *= dbus

+    DEFINES += QTM_BLUEZ_BLUETOOTH

     include(bluez/bluez.pri)

--- src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h 2011-05-10 10:06:11.000000000 +0200

+++ src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h 2011-08-10 15:24:12.000000000 +0200

@@ -101,7 +101,7 @@

     Q_DECLARE_PRIVATE(QBluetoothDeviceDiscoveryAgent)

     QBluetoothDeviceDiscoveryAgentPrivate *d_ptr;

-#ifndef QT_NO_DBUS

+#ifdef QTM_BLUEZ_BLUETOOTH

     Q_PRIVATE_SLOT(d_func(), void _q_deviceFound(const QString &address, const QVariantMap &dict));

     Q_PRIVATE_SLOT(d_func(), void _q_propertyChanged(const QString &name, const QDBusVariant &value));

 #endif

--- src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp 2011-05-10 10:06:11.000000000 +0200

+++ src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp 2011-08-10 15:24:12.000000000 +0200

@@ -69,7 +69,7 @@

 void QBluetoothDeviceDiscoveryAgentPrivate::stop()

 {

 }

-#ifndef QT_NO_DBUS

+#ifdef QTM_BLUEZ_BLUETOOTH

 void QBluetoothDeviceDiscoveryAgentPrivate::_q_deviceFound(const QString &address,

                                                            const QVariantMap &dict)

 {

--- src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h   2011-05-10 10:06:11.000000000 +0200

+++ src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h   2011-08-10 15:24:46.000000000 +0200

@@ -46,7 +46,7 @@

 #include <QVariantMap>

-#ifndef QT_NO_DBUS

+#ifdef QTM_BLUEZ_BLUETOOTH

 class OrgBluezManagerInterface;

 class OrgBluezAdapterInterface;

 class QDBusVariant;

@@ -80,7 +80,7 @@

             QString errorDescription);

 #endif

-#ifndef QT_NO_DBUS

+#ifdef QTM_BLUEZ_BLUETOOTH

     void _q_deviceFound(const QString &address, const QVariantMap &dict);

     void _q_propertyChanged(const QString &name, const QDBusVariant &value);

 #endif

@@ -100,7 +100,7 @@

     bool pendingCancel;

     bool pendingStart;

-#if !defined(QT_NO_DBUS)

+#ifdef QTM_BLUEZ_BLUETOOTH

     OrgBluezManagerInterface *manager;

     OrgBluezAdapterInterface *adapter;

 #endif

--- src/connectivity/bluetooth/qbluetoothlocaldevice_p.h    2011-05-10 10:06:11.000000000 +0200

+++ src/connectivity/bluetooth/qbluetoothlocaldevice_p.h    2011-08-10 15:24:12.000000000 +0200