Merge remote-tracking branch 'gerrit/dev' into wip/win

Change-Id: Ia5d83a88d6231984d9745d1c64f03553499a5882

1 files changed, 56 insertions, 9 deletions

diff --git a/src/nfc/qnearfieldmanager.cpp b/src/nfc/qnearfieldmanager.cpp
index 099a070c..02e4d918 100644
--- a/src/nfc/qnearfieldmanager.cpp
+++ b/src/nfc/qnearfieldmanager.cpp
@@ -119,6 +119,19 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
+    \enum QNearFieldManager::AdapterState
+
+    \since 5.12
+
+    This enum describes the different states a NFC adapter can have.
+
+    \value Offline      The nfc adapter is offline.
+    \value TurningOn    The nfc adapter is turning on.
+    \value Online       The nfc adapter is online.
+    \value TurningOff   The nfc adapter is turning off.
+*/
+
+/*!
     \enum QNearFieldManager::TargetAccessMode
 
     This enum describes the different access modes an application can have.
@@ -133,6 +146,16 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
+    \fn void QNearFieldManager::adapterStateChanged(AdapterState state)
+
+    \since 5.12
+
+    This signal is emitted whenever the state of the NFC adapter changed.
+
+    \note Currently, this signal is only emitted on Android.
+*/
+
+/*!
     \fn void QNearFieldManager::targetDetected(QNearFieldTarget *target)
 
     This signal is emitted whenever a target is detected. The \a target parameter represents the
@@ -169,10 +192,14 @@ QT_BEGIN_NAMESPACE
 QNearFieldManager::QNearFieldManager(QObject *parent)
 :   QObject(parent), d_ptr(new QNearFieldManagerPrivateImpl)
 {
-    connect(d_ptr, SIGNAL(targetDetected(QNearFieldTarget*)),
-            this, SIGNAL(targetDetected(QNearFieldTarget*)));
-    connect(d_ptr, SIGNAL(targetLost(QNearFieldTarget*)),
-            this, SIGNAL(targetLost(QNearFieldTarget*)));
+    qRegisterMetaType<AdapterState>();
+
+    connect(d_ptr, &QNearFieldManagerPrivate::adapterStateChanged,
+            this, &QNearFieldManager::adapterStateChanged);
+    connect(d_ptr, &QNearFieldManagerPrivate::targetDetected,
+            this, &QNearFieldManager::targetDetected);
+    connect(d_ptr, &QNearFieldManagerPrivate::targetLost,
+            this, &QNearFieldManager::targetLost);
 }
 
 /*!
@@ -186,10 +213,14 @@ QNearFieldManager::QNearFieldManager(QObject *parent)
 QNearFieldManager::QNearFieldManager(QNearFieldManagerPrivate *backend, QObject *parent)
 :   QObject(parent), d_ptr(backend)
 {
-    connect(d_ptr, SIGNAL(targetDetected(QNearFieldTarget*)),
-            this, SIGNAL(targetDetected(QNearFieldTarget*)));
-    connect(d_ptr, SIGNAL(targetLost(QNearFieldTarget*)),
-            this, SIGNAL(targetLost(QNearFieldTarget*)));
+    qRegisterMetaType<AdapterState>();
+
+    connect(d_ptr, &QNearFieldManagerPrivate::adapterStateChanged,
+            this, &QNearFieldManager::adapterStateChanged);
+    connect(d_ptr, &QNearFieldManagerPrivate::targetDetected,
+            this, &QNearFieldManager::targetDetected);
+    connect(d_ptr, &QNearFieldManagerPrivate::targetLost,
+            this, &QNearFieldManager::targetLost);
 }
 
 /*!
@@ -201,7 +232,10 @@ QNearFieldManager::~QNearFieldManager()
 }
 
 /*!
-    Returns true if NFC functionality is available; otherwise returns false.
+    Returns \c true if the device has a NFC adapter and
+    it is turned on; otherwise returns \c false.
+
+    \sa isSupported()
 */
 bool QNearFieldManager::isAvailable() const
 {
@@ -211,6 +245,19 @@ bool QNearFieldManager::isAvailable() const
 }
 
 /*!
+    \since 5.12
+
+    Returns \c true if the underlying device has a NFC adapter; otherwise returns \c false.
+
+    \sa isAvailable()
+*/
+bool QNearFieldManager::isSupported() const
+{
+    Q_D(const QNearFieldManager);
+
+    return d->isSupported();
+}
+/*!
     \fn bool QNearFieldManager::startTargetDetection()
 
     Starts detecting targets and returns true if target detection is