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/osxbtsdpinquiry.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/osxbtsdpinquiry.mm')
| -rw-r--r-- | src/bluetooth/osx/osxbtsdpinquiry.mm | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/bluetooth/osx/osxbtsdpinquiry.mm b/src/bluetooth/osx/osxbtsdpinquiry.mm index 28dc2342..a1d6af1c 100644 --- a/src/bluetooth/osx/osxbtsdpinquiry.mm +++ b/src/bluetooth/osx/osxbtsdpinquiry.mm @@ -42,12 +42,9 @@ #include "qbluetoothuuid.h" #include "osxbtutility_p.h" - #include <QtCore/qvariant.h> #include <QtCore/qstring.h> -#include "corebluetoothwrapper_p.h" - QT_BEGIN_NAMESPACE namespace OSXBluetooth { @@ -141,10 +138,7 @@ QList<QBluetoothUuid> extract_services_uuids(IOBluetoothDevice *device) QT_END_NAMESPACE - -#ifdef QT_NAMESPACE -using namespace QT_NAMESPACE; -#endif +QT_USE_NAMESPACE using namespace OSXBluetooth; |