diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 03:01:29 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 03:01:29 +0100 |
| commit | d68becfb4cb60ecee9d6142c60eeb8a1fcdb3acd (patch) | |
| tree | d21d0520ae419728fec7136e91281a9ff46d1105 /tests | |
| parent | 6e0f49fa664731dc0479f3e8d9b3f2914357f74e (diff) | |
| parent | 4af2d432a08a17c741bd01d9a1517b2f17657291 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I337d146591585cfae67122b030b72f6f83986b76
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qnearfieldmanager/qnearfieldmanager.pro | 5 | ||||
| -rw-r--r-- | tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro | 5 | ||||
| -rw-r--r-- | tests/auto/qnearfieldtagtype2/nfcdata/Dynamic Empty Tag.nfc (renamed from tests/auto/qnearfieldtagtype2/Dynamic Empty Tag.nfc) | 0 | ||||
| -rw-r--r-- | tests/auto/qnearfieldtagtype2/nfcdata/Empty Tag.nfc (renamed from tests/auto/qnearfieldtagtype2/Empty Tag.nfc) | 0 | ||||
| -rw-r--r-- | tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro | 7 |
5 files changed, 16 insertions, 1 deletions
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 diff --git a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro index 649541fd..e765151d 100644 --- a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro +++ b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.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 diff --git a/tests/auto/qnearfieldtagtype2/Dynamic Empty Tag.nfc b/tests/auto/qnearfieldtagtype2/nfcdata/Dynamic Empty Tag.nfc index 30cf6b2d..30cf6b2d 100644 --- a/tests/auto/qnearfieldtagtype2/Dynamic Empty Tag.nfc +++ b/tests/auto/qnearfieldtagtype2/nfcdata/Dynamic Empty Tag.nfc diff --git a/tests/auto/qnearfieldtagtype2/Empty Tag.nfc b/tests/auto/qnearfieldtagtype2/nfcdata/Empty Tag.nfc index 22b31b4a..22b31b4a 100644 --- a/tests/auto/qnearfieldtagtype2/Empty Tag.nfc +++ b/tests/auto/qnearfieldtagtype2/nfcdata/Empty Tag.nfc diff --git a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro index 45d2fbe8..aa388312 100644 --- a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro +++ b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro @@ -21,4 +21,9 @@ SOURCES += \ qnearfieldmanager_emulator.cpp \ targetemulator.cpp -DEFINES += SRCDIR=\\\"$$PWD\\\" +DEFINES += SRCDIR=\\\"$$PWD/nfcdata\\\" + +TESTDATA += "$$PWD/nfcdata/Dynamic Empty Tag.nfc" \ + "$$PWD/nfcdata/Empty Tag.nfc" + +builtin_testdata: DEFINES += BUILTIN_TESTDATA |