diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 17:12:21 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 17:12:21 +0100 |
| commit | 4a772a14761a7a0a9ebb2766b9d78189f60b0cd4 (patch) | |
| tree | 0885b919211245f854a3cf9f286a8cc951063df7 /src/bluetooth/qbluetoothlocaldevice.cpp | |
| parent | ad43587ae1ce5461825e06136ab548a7f34a007e (diff) | |
| parent | 9f547761f35fff54994f805735d5ac2e538e53dc (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/bluetooth/qbluetoothlocaldevice_qnx.cpp
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: If7dd968047fec5352567e9b67ca5b8e680c7523d
Diffstat (limited to 'src/bluetooth/qbluetoothlocaldevice.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice.cpp b/src/bluetooth/qbluetoothlocaldevice.cpp index fa9057a1..da3c4fa7 100644 --- a/src/bluetooth/qbluetoothlocaldevice.cpp +++ b/src/bluetooth/qbluetoothlocaldevice.cpp @@ -44,7 +44,6 @@ #include "qbluetoothaddress.h" #include <QtCore/QString> -#include <QDebug> QT_BEGIN_NAMESPACE |