diff options
-rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp | 4 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_p.cpp | 4 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothserver_p.cpp | 4 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_p.cpp | 4 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothserviceinfo_p.cpp | 4 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothsocket_p.cpp | 4 | ||||
-rw-r--r-- | src/bluetooth/qlowenergycontroller_p.cpp | 4 | ||||
-rw-r--r-- | tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp | 4 |
8 files changed, 30 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp index 09076d6d..f7780722 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp @@ -42,7 +42,9 @@ #include "qbluetoothaddress.h" #include "qbluetoothuuid.h" +#ifndef QT_IOS_BLUETOOTH #include "dummy/dummy_helper_p.h" +#endif #define QT_DEVICEDISCOVERY_DEBUG @@ -56,7 +58,9 @@ QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate( q_ptr(parent) { Q_UNUSED(deviceAdapter); +#ifndef QT_IOS_BLUETOOTH printDummyWarning(); +#endif } QBluetoothDeviceDiscoveryAgentPrivate::~QBluetoothDeviceDiscoveryAgentPrivate() diff --git a/src/bluetooth/qbluetoothlocaldevice_p.cpp b/src/bluetooth/qbluetoothlocaldevice_p.cpp index efeeee5d..f266d64c 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_p.cpp @@ -41,7 +41,9 @@ #include "qbluetoothaddress.h" #include "qbluetoothlocaldevice_p.h" +#ifndef QT_IOS_BLUETOOTH #include "dummy/dummy_helper_p.h" +#endif QT_BEGIN_NAMESPACE @@ -49,7 +51,9 @@ QBluetoothLocalDevice::QBluetoothLocalDevice(QObject *parent) : QObject(parent), d_ptr(0) { +#ifndef QT_IOS_BLUETOOTH printDummyWarning(); +#endif registerQBluetoothLocalDeviceMetaType(); } diff --git a/src/bluetooth/qbluetoothserver_p.cpp b/src/bluetooth/qbluetoothserver_p.cpp index e12598fa..7f8e3525 100644 --- a/src/bluetooth/qbluetoothserver_p.cpp +++ b/src/bluetooth/qbluetoothserver_p.cpp @@ -40,14 +40,18 @@ #include "qbluetoothserver.h" #include "qbluetoothserver_p.h" #include "qbluetoothsocket.h" +#ifndef QT_IOS_BLUETOOTH #include "dummy/dummy_helper_p.h" +#endif QT_BEGIN_NAMESPACE QBluetoothServerPrivate::QBluetoothServerPrivate(QBluetoothServiceInfo::Protocol sType) : maxPendingConnections(1), serverType(sType), m_lastError(QBluetoothServer::NoError) { +#ifndef QT_IOS_BLUETOOTH printDummyWarning(); +#endif if (sType == QBluetoothServiceInfo::RfcommProtocol) socket = new QBluetoothSocket(QBluetoothServiceInfo::RfcommProtocol); else diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp index fe3fd75f..c7780e7f 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp @@ -39,7 +39,9 @@ #include "qbluetoothservicediscoveryagent.h" #include "qbluetoothservicediscoveryagent_p.h" +#ifndef QT_IOS_BLUETOOTH #include "dummy/dummy_helper_p.h" +#endif QT_BEGIN_NAMESPACE @@ -48,7 +50,9 @@ QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(c deviceDiscoveryAgent(0), mode(QBluetoothServiceDiscoveryAgent::MinimalDiscovery), singleDevice(false) { +#ifndef QT_IOS_BLUETOOTH printDummyWarning(); +#endif Q_UNUSED(deviceAdapter); } diff --git a/src/bluetooth/qbluetoothserviceinfo_p.cpp b/src/bluetooth/qbluetoothserviceinfo_p.cpp index 00e38ba2..43e08db5 100644 --- a/src/bluetooth/qbluetoothserviceinfo_p.cpp +++ b/src/bluetooth/qbluetoothserviceinfo_p.cpp @@ -39,13 +39,17 @@ #include "qbluetoothserviceinfo.h" #include "qbluetoothserviceinfo_p.h" +#ifndef QT_IOS_BLUETOOTH #include "dummy/dummy_helper_p.h" +#endif QT_BEGIN_NAMESPACE QBluetoothServiceInfoPrivate::QBluetoothServiceInfoPrivate() { +#ifndef QT_IOS_BLUETOOTH printDummyWarning(); +#endif } QBluetoothServiceInfoPrivate::~QBluetoothServiceInfoPrivate() diff --git a/src/bluetooth/qbluetoothsocket_p.cpp b/src/bluetooth/qbluetoothsocket_p.cpp index f61f3d87..5ebba4ad 100644 --- a/src/bluetooth/qbluetoothsocket_p.cpp +++ b/src/bluetooth/qbluetoothsocket_p.cpp @@ -39,7 +39,9 @@ #include "qbluetoothsocket.h" #include "qbluetoothsocket_p.h" +#ifndef QT_IOS_BLUETOOTH #include "dummy/dummy_helper_p.h" +#endif QT_BEGIN_NAMESPACE @@ -50,7 +52,9 @@ QBluetoothSocketPrivate::QBluetoothSocketPrivate() socketError(QBluetoothSocket::NoSocketError), secFlags(QBluetooth::NoSecurity) { +#ifndef QT_IOS_BLUETOOTH printDummyWarning(); +#endif } QBluetoothSocketPrivate::~QBluetoothSocketPrivate() diff --git a/src/bluetooth/qlowenergycontroller_p.cpp b/src/bluetooth/qlowenergycontroller_p.cpp index 149b6adf..27d16093 100644 --- a/src/bluetooth/qlowenergycontroller_p.cpp +++ b/src/bluetooth/qlowenergycontroller_p.cpp @@ -38,7 +38,9 @@ ****************************************************************************/ #include "qlowenergycontroller_p.h" +#ifndef QT_IOS_BLUETOOTH #include "dummy/dummy_helper_p.h" +#endif QT_BEGIN_NAMESPACE @@ -48,7 +50,9 @@ QLowEnergyControllerPrivate::QLowEnergyControllerPrivate() error(QLowEnergyController::NoError), lastLocalHandle(0) { +#ifndef QT_IOS_BLUETOOTH printDummyWarning(); +#endif registerQLowEnergyControllerMetaType(); } diff --git a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp index 701e1825..773c673b 100644 --- a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp +++ b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp @@ -245,7 +245,7 @@ void tst_QLowEnergyController::tst_connect() QList<QBluetoothHostInfo> localAdapters = QBluetoothLocalDevice::allDevices(); #if defined(Q_OS_IOS) || defined(Q_OS_TVOS) - if (remoteDeviceInfo.isValid()) + if (!remoteDeviceInfo.isValid()) #else if (localAdapters.isEmpty() || !remoteDeviceInfo.isValid()) #endif @@ -345,7 +345,7 @@ void tst_QLowEnergyController::tst_connect() // initiate characteristic discovery foreach (QLowEnergyService *service, savedReferences) { - qDebug() << "Discoverying" << service->serviceUuid(); + qDebug() << "Discovering" << service->serviceUuid(); QSignalSpy stateSpy(service, SIGNAL(stateChanged(QLowEnergyService::ServiceState))); QSignalSpy errorSpy(service, SIGNAL(error(QLowEnergyService::ServiceError))); |