diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-16 13:35:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-16 13:35:53 +0000 |
| commit | 9cf135dd2c2544a8c1f889b5de38136aa3ec1d4d (patch) | |
| tree | 4cbc412f2f6b1ab2e11ba871d92fb68ac7e32015 /src/nfc | |
| parent | 7354c6d3939440803d0d0d884baec48040c02bb3 (diff) | |
| parent | 89aaf528c96072dd93505284b9a8fc268e0acd6e (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
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 7ed79f84..2c3c7077 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 596230d1..cc85086f 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> |