diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2018-11-30 10:58:06 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-12-06 06:30:56 +0000 |
| commit | 65bea2ce743d628773591793d35f2048fda5820a (patch) | |
| tree | 4e99177a97f4df661e88972a606abc6138b18355 | |
| parent | 35f72acc4795f5919ca9caaf50960e8416e804ef (diff) | |
Prepare tst_qnearfieldmanager for configurations with builtin_testdata
We have to add relevant test data to TESTDATA and use them from the
created qrc file.
Change-Id: I72ed86e09caf518f3f1b830ab4fec104a81313e6
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -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 |