summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/doc
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-02-16 21:52:03 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-02-16 21:52:03 +0100
commiteef68dea35960670c1a1a1431d4541e1ed19c781 (patch)
tree097e6575b0cbc43704077d76372c986dcce3c998 /src/bluetooth/doc
parentfa2389dd0a6df58d73d221654db36ff791b96e43 (diff)
parentc87458961f29064ab69a308526b0243debcdf1f7 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: .qmake.conf src/bluetooth/qlowenergycontroller_bluez.cpp Change-Id: I00f45a2a22a045e7836f2caeb76cc5599ced6279
Diffstat (limited to 'src/bluetooth/doc')
-rw-r--r--src/bluetooth/doc/src/bluetooth-index.qdoc26
1 files changed, 26 insertions, 0 deletions
diff --git a/src/bluetooth/doc/src/bluetooth-index.qdoc b/src/bluetooth/doc/src/bluetooth-index.qdoc
index 8e5f1d35..8ea4c7f9 100644
--- a/src/bluetooth/doc/src/bluetooth-index.qdoc
+++ b/src/bluetooth/doc/src/bluetooth-index.qdoc
@@ -75,6 +75,32 @@ import statement in your \c .qml file:
\li \l {Qt Bluetooth C++ Classes}{C++ Classes}
\endlist
+\section2 Logging Categories
+
+The \l QtBluetooth module exports the following
+\l {Configuring Categories}{logging categories}:
+
+\table
+\header
+ \li Logging Category
+ \li Description
+\row
+ \li qt.bluetooth
+ \li Enables logging of cross platform code path in QtBluetooth
+\row
+ \li qt.bluetooth.android
+ \li Enables logging of the Android implementation
+\row
+ \li qt.bluetooth.bluez
+ \li Enables logging of the BLuez/Linux implementation
+\row
+ \li qt.bluetooth.ios
+ \li Enables logging of the iOS implementation
+\row
+ \li qt.bluetooth.osx
+ \li Enables logging of the OS X implementation
+\endtable
+
\section2 Examples
\list
\li QML