diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-23 11:59:43 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-23 11:59:43 +0200 |
| commit | bde54c522b76eeb933296aa1a9e159facbf8e529 (patch) | |
| tree | 642588398127104a31d23f3d45c0b31433124a9a /src/bluetooth/qbluetoothlocaldevice_p.cpp | |
| parent | 5b548aa2ffe648810c487ecb895631da2be12a33 (diff) | |
| parent | 4a9c146e151328165c0266aec432391655f8fc8b (diff) | |
Merge remote-tracking branch 'gerrit/5.6' into 5.7
Change-Id: I33cfb293df15c82247561d3540a4513cdf63b910
Diffstat (limited to 'src/bluetooth/qbluetoothlocaldevice_p.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_p.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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(); } |