diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-09-24 07:23:23 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-09-24 07:23:23 +0200 |
| commit | 86a716072ee6ccf59dba8a474d15558eb1438966 (patch) | |
| tree | 1d51bd72017c984984f2c08fc22e20b15a8c0e0c /src/bluetooth/qbluetooth.cpp | |
| parent | fba05edde4fd6699da731ffc05660364df613502 (diff) | |
| parent | 4ff26a9993b9a797a3e7dcdcd82e13b7b513bc30 (diff) | |
Merge branch 'dev' into win
Conflicts:
src/bluetooth/qbluetooth.cpp
src/bluetooth/qbluetoothdevicediscoveryagent_p.h
src/bluetooth/qbluetoothlocaldevice_p.h
Change-Id: I20fa8968db6c6461014899698c17aa86cd969189
Diffstat (limited to 'src/bluetooth/qbluetooth.cpp')
| -rw-r--r-- | src/bluetooth/qbluetooth.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetooth.cpp b/src/bluetooth/qbluetooth.cpp index 195e4f3e..9ab6728f 100644 --- a/src/bluetooth/qbluetooth.cpp +++ b/src/bluetooth/qbluetooth.cpp @@ -81,7 +81,6 @@ namespace QBluetooth { Q_LOGGING_CATEGORY(QT_BT, "qt.bluetooth") Q_LOGGING_CATEGORY(QT_BT_ANDROID, "qt.bluetooth.android") Q_LOGGING_CATEGORY(QT_BT_BLUEZ, "qt.bluetooth.bluez") -Q_LOGGING_CATEGORY(QT_BT_QNX, "qt.bluetooth.qnx") Q_LOGGING_CATEGORY(QT_BT_WINDOWS, "qt.bluetooth.windows") QT_END_NAMESPACE |