diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-23 12:18:01 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-23 12:18:52 +0200 |
| commit | 241ef04afe45967a736802d4f4ce89d79e4b6d1b (patch) | |
| tree | 133a0a081f18e754764233c81fb11a12d2a0de64 /src/bluetooth/qbluetoothserver_p.cpp | |
| parent | 9406019386448452982ef4dacdbe1d910e903cd1 (diff) | |
| parent | 7393531856058a8a0fe440d3a64728248958ac81 (diff) | |
Merge remote-tracking branch 'gerrit/5.6.1' into 5.7.0v5.7.0-rc1
Change-Id: Ia4d1af9c446b3248d7b4fd7c2ceef845099885a4
Diffstat (limited to 'src/bluetooth/qbluetoothserver_p.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothserver_p.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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 |