diff options
| -rw-r--r-- | src/nfc/qnearfieldtarget_emulator.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qnearfieldmanager/qnearfieldmanager.pro | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nfc/qnearfieldtarget_emulator.cpp b/src/nfc/qnearfieldtarget_emulator.cpp index a4bd888c..0a083084 100644 --- a/src/nfc/qnearfieldtarget_emulator.cpp +++ b/src/nfc/qnearfieldtarget_emulator.cpp @@ -281,7 +281,9 @@ void TagActivator::timerEvent(QTimerEvent *e) tagMutex.lock(); } - ++m_current; + if (m_current != tagMap.end()) + ++m_current; + if (m_current == tagMap.end()) m_current = tagMap.begin(); diff --git a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro index 20772f6c..c40adaa9 100644 --- a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro +++ b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro @@ -27,5 +27,3 @@ SOURCES += \ DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\" DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -# This test crashes -CONFIG += insignificant_test |