diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-05 19:32:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-05 19:32:05 +0200 |
| commit | 7b443cd0fdd1940a8bfaad73df5e309a52b7669f (patch) | |
| tree | d6eedd5d35db41c09864997596b0749b12a2e6f4 /src/bluetooth/osx/osxbtledeviceinquiry.mm | |
| parent | c4b8dee6b4cfdc6728094d237d7984791e2cecea (diff) | |
| parent | 052e7ce371d4719df778ad8b378bcf1af14d294b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Iff285e35cdca30fee28c7927bc01498d70f9de9e
Diffstat (limited to 'src/bluetooth/osx/osxbtledeviceinquiry.mm')
| -rw-r--r-- | src/bluetooth/osx/osxbtledeviceinquiry.mm | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/bluetooth/osx/osxbtledeviceinquiry.mm b/src/bluetooth/osx/osxbtledeviceinquiry.mm index c3f515d0..7b9e7431 100644 --- a/src/bluetooth/osx/osxbtledeviceinquiry.mm +++ b/src/bluetooth/osx/osxbtledeviceinquiry.mm @@ -46,8 +46,6 @@ #include <QtCore/qsysinfo.h> #include <QtCore/qdebug.h> -#include "corebluetoothwrapper_p.h" - QT_BEGIN_NAMESPACE namespace OSXBluetooth { @@ -103,11 +101,7 @@ StringStrongReference uuid_as_nsstring(CFUUIDRef uuid) QT_END_NAMESPACE -#ifdef QT_NAMESPACE - -using namespace QT_NAMESPACE; - -#endif +QT_USE_NAMESPACE @interface QT_MANGLE_NAMESPACE(OSXBTLEDeviceInquiry) (PrivateAPI) <CBCentralManagerDelegate> - (void)stopScan; |