Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	.qmake.conf
	src/bluetooth/qlowenergycontroller_bluez.cpp

Change-Id: I00f45a2a22a045e7836f2caeb76cc5599ced6279

2 files changed, 17 insertions, 0 deletions

diff --git a/src/nfc/doc/src/nfc-index.qdoc b/src/nfc/doc/src/nfc-index.qdoc
index da8833d8..a37ba293 100644
--- a/src/nfc/doc/src/nfc-index.qdoc
+++ b/src/nfc/doc/src/nfc-index.qdoc
@@ -73,6 +73,20 @@ import statement in your \c .qml file:
     \li \l {Qt NFC C++ Classes}{C++ Classes}
 \endlist
 
+\section2 Logging Categories
+
+The \l QtNfc module exports the following
+\l {Configuring Categories}{logging categories}:
+
+\table
+\header
+    \li Logging Category
+    \li Description
+\row
+    \li qt.nfc.neard
+    \li Enables logging of the Neard/Linux implementation
+\endtable
+
 \section2 Examples
 \list
     \li QML
diff --git a/src/nfc/qqmlndefrecord.cpp b/src/nfc/qqmlndefrecord.cpp
index 5cd5b4d5..1f855ede 100644
--- a/src/nfc/qqmlndefrecord.cpp
+++ b/src/nfc/qqmlndefrecord.cpp
@@ -249,6 +249,9 @@ QQmlNdefRecord::QQmlNdefRecord(const QNdefRecord &record, QObject *parent)
     d_ptr->record = record;
 }
 
+/*!
+    Destroys the QQmlNdefRecord instance.
+*/
 QQmlNdefRecord::~QQmlNdefRecord()
 {
     delete d_ptr;