diff options
| author | BogDan Vatra <bogdan@kde.org> | 2014-12-19 14:42:12 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2014-12-22 08:32:39 +0100 |
| commit | 2073057bde383ae62540c11d47498cc774181d38 (patch) | |
| tree | cfdd5d26204901348f3adde4b4b9f8d1a7013d32 /tests | |
| parent | 81d116595c64d62dec701214579d094c5e0d51e5 (diff) | |
Android: Fix json test.
Add test data to resources.
Change-Id: Ib8a5688e7caab8434b8f0676f53a2a79ec94b264
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/json/json.pro | 5 | ||||
| -rw-r--r-- | tests/auto/corelib/json/json.qrc | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/tests/auto/corelib/json/json.pro b/tests/auto/corelib/json/json.pro index 25d740f5b9..237e20685a 100644 --- a/tests/auto/corelib/json/json.pro +++ b/tests/auto/corelib/json/json.pro @@ -1,10 +1,11 @@ -TARGET = tst_qtjson +TARGET = tst_json QT = core testlib CONFIG -= app_bundle CONFIG += testcase CONFIG += parallel_test -TESTDATA += test.json test.bjson test3.json test2.json +!android:TESTDATA += test.json test.bjson test3.json test2.json + else:RESOURCES += json.qrc SOURCES += tst_qtjson.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/json/json.qrc b/tests/auto/corelib/json/json.qrc new file mode 100644 index 0000000000..eb122a1779 --- /dev/null +++ b/tests/auto/corelib/json/json.qrc @@ -0,0 +1,9 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource prefix="/"> + <file>bom.json</file> + <file>test2.json</file> + <file>test3.json</file> + <file>test.json</file> + <file>test.bjson</file> +</qresource> +</RCC> |