diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-16 10:37:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-16 10:37:07 +0100 |
| commit | 89aaf528c96072dd93505284b9a8fc268e0acd6e (patch) | |
| tree | 3fdb52646b2f60a3641c6585c4b27099902bb08f /src/nfc | |
| parent | 3264db95f965a47f31ffe1ab768467ce827e41e9 (diff) | |
| parent | 90291d71308db90d763e5b42a8f096301ceb9666 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/bluetooth/qbluetoothdeviceinfo.h
Change-Id: I2ad566b9ca8fb001fa91a74501e83e8a2121ef3a
Diffstat (limited to 'src/nfc')
| -rw-r--r-- | src/nfc/qnearfieldmanager_qnx.cpp | 4 | ||||
| -rw-r--r-- | src/nfc/qnearfieldsharetarget.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nfc/qnearfieldmanager_qnx.cpp b/src/nfc/qnearfieldmanager_qnx.cpp index 6e3b0eb9..78b1231c 100644 --- a/src/nfc/qnearfieldmanager_qnx.cpp +++ b/src/nfc/qnearfieldmanager_qnx.cpp @@ -85,7 +85,7 @@ void QNearFieldManagerPrivateImpl::stopTargetDetection() int QNearFieldManagerPrivateImpl::registerNdefMessageHandler(QObject *object, const QMetaMethod &method) { QList<QByteArray> filterList; - filterList += "*"; + filterList += '*'; QNXNFCManager::instance()->updateNdefFilters(filterList, this); ndefMessageHandlers.append(QPair<QPair<int, QObject *>, QMetaMethod>(QPair<int, QObject *>(m_handlerID, object), method)); @@ -180,7 +180,7 @@ void QNearFieldManagerPrivateImpl::updateNdefFilter() qQNXNFCDebug() << "Updating NDEF filter"; QList<QByteArray> filterList; if (ndefMessageHandlers.size() > 0) { ///SUbscribe for all ndef messages - filterList += "*"; + filterList += '*'; QNXNFCManager::instance()->updateNdefFilters(filterList, this); } else if (ndefFilterHandlers.size() > 0){ for (int i = 0; i < ndefFilterHandlers.count(); i++) { diff --git a/src/nfc/qnearfieldsharetarget.h b/src/nfc/qnearfieldsharetarget.h index 41d6880d..822a8ed5 100644 --- a/src/nfc/qnearfieldsharetarget.h +++ b/src/nfc/qnearfieldsharetarget.h @@ -36,7 +36,7 @@ #define QNEARFIELDSHARETARGET_H #include <QtCore/QObject> -#include <QFileInfo> +#include <QtCore/QFileInfo> #include <QtNfc/QNdefMessage> #include <QtNfc/QNearFieldShareManager> |