diff options
| -rw-r--r-- | src/nfc/qnearfieldtarget_emulator.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qnearfieldmanager/qnearfieldmanager.pro | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/nfc/qnearfieldtarget_emulator.cpp b/src/nfc/qnearfieldtarget_emulator.cpp index 030718cc..996ddcef 100644 --- a/src/nfc/qnearfieldtarget_emulator.cpp +++ b/src/nfc/qnearfieldtarget_emulator.cpp @@ -201,7 +201,11 @@ void TagActivator::initialize() if (!tagMap.isEmpty()) return; +#ifndef BUILTIN_TESTDATA QDirIterator nfcTargets(QDir::currentPath(), QStringList(QStringLiteral("*.nfc")), QDir::Files); +#else + QDirIterator nfcTargets(":/nfcdata", QStringList(QStringLiteral("*.nfc")), QDir::Files); +#endif while (nfcTargets.hasNext()) { const QString targetFilename = nfcTargets.next(); diff --git a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro index 0361235a..e01f9b84 100644 --- a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro +++ b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro @@ -22,3 +22,8 @@ SOURCES += \ targetemulator.cpp DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\" + +TESTDATA += "$$PWD/../nfcdata/Qt Labs Website Tag Type1.nfc" \ + "$$PWD/../nfcdata/Qt Website Tag Type1.nfc" + +builtin_testdata: DEFINES += BUILTIN_TESTDATA |