diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2017-02-08 10:18:35 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-02-08 11:56:06 +0000 |
| commit | 89cf6da818279b16708d320ae3f5ed434310a347 (patch) | |
| tree | 73e968ff604d054123107c4fad6bf69afd219494 | |
| parent | a754b7c82ccb63b2b7d8c38b1f8165aedaa3afb5 (diff) | |
WinRT: Remove dummy warningv5.9.0-alpha1
With classic bluetooth in place the dummy warning is no longer needed
even though peripheral support is not implemented yet.
Change-Id: Ia6e471cf74583d9ea704217687de272dc6d46433
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 3 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_p.cpp | 2 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothtransfermanager.cpp | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index b07ad431..601e2bcd 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -194,9 +194,6 @@ qtConfig(bluez):qtHaveModule(dbus) { DEFINES += QT_WINRT_BLUETOOTH QT += core-private - # remove dummy warning once platform port is complete - include(dummy/dummy.pri) - SOURCES += \ qbluetoothdevicediscoveryagent_winrt.cpp \ qbluetoothlocaldevice_p.cpp \ diff --git a/src/bluetooth/qbluetoothlocaldevice_p.cpp b/src/bluetooth/qbluetoothlocaldevice_p.cpp index 28e787c7..7a9d8221 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_p.cpp @@ -51,7 +51,7 @@ QBluetoothLocalDevice::QBluetoothLocalDevice(QObject *parent) : QObject(parent), d_ptr(0) { -#ifndef QT_IOS_BLUETOOTH +#if !defined(QT_IOS_BLUETOOTH) && !defined(QT_WINRT_BLUETOOTH) printDummyWarning(); #endif registerQBluetoothLocalDeviceMetaType(); diff --git a/src/bluetooth/qbluetoothtransfermanager.cpp b/src/bluetooth/qbluetoothtransfermanager.cpp index 7206dce6..ab05902f 100644 --- a/src/bluetooth/qbluetoothtransfermanager.cpp +++ b/src/bluetooth/qbluetoothtransfermanager.cpp @@ -121,8 +121,8 @@ QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransfer connect(reply, SIGNAL(finished(QBluetoothTransferReply*)), this, SIGNAL(finished(QBluetoothTransferReply*))); return reply; #else - // Android and iOS have no implementation -#if !defined(QT_ANDROID_BLUETOOTH) && !defined(QT_IOS_BLUETOOTH) + // Android, iOS, and WinRT have no implementation +#if !defined(QT_ANDROID_BLUETOOTH) && !defined(QT_IOS_BLUETOOTH) && !defined(QT_WINRT_BLUETOOTH) printDummyWarning(); #endif Q_UNUSED(request); |