1 files changed, 6 insertions, 7 deletions
diff --git a/src/nfc/qnearfieldtarget.cpp b/src/nfc/qnearfieldtarget.cpp
index e9a6fa11..7d83db78 100644
--- a/src/nfc/qnearfieldtarget.cpp
+++ b/src/nfc/qnearfieldtarget.cpp
@@ -47,7 +47,7 @@
 
 #include <QtCore/QDebug>
 
-#include <QTime>
+#include <QElapsedTimer>
 #include <QCoreApplication>
 
 QT_BEGIN_NAMESPACE
@@ -462,7 +462,7 @@ bool QNearFieldTarget::waitForRequestCompleted(const RequestId &id, int msecs)
 {
     Q_D(QNearFieldTarget);
 
-    QTime timer;
+    QElapsedTimer timer;
     timer.start();
 
     do {
@@ -497,13 +497,12 @@ void QNearFieldTarget::setResponseForRequest(const QNearFieldTarget::RequestId &
 {
     Q_D(QNearFieldTarget);
 
-    QMutableMapIterator<RequestId, QVariant> i(d->m_decodedResponses);
-    while (i.hasNext()) {
-        i.next();
-
+    for (auto i = d->m_decodedResponses.begin(), end = d->m_decodedResponses.end(); i != end; /* erasing */) {
         // no more external references
         if (i.key().refCount() == 1)
-            i.remove();
+            i = d->m_decodedResponses.erase(i);
+        else
+            ++i;
     }
 
     d->m_decodedResponses.insert(id, response);