diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:37:38 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:37:38 +0100 |
commit | aaff94c2df665035addb90714bab4722003894da (patch) | |
tree | 3af76e8aa4dbf86a86b1e4d2ad2f6dda06374ee0 /tests/auto/corelib/json | |
parent | 2302d386c7a1aa1a96658f79c236d6b8a59db7ac (diff) | |
parent | 1196f691120d77ab3be55f21824aba645210fb8c (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/tools/qbytearray.cpp
src/gui/kernel/qplatformsystemtrayicon.cpp
src/gui/kernel/qplatformsystemtrayicon.h
src/plugins/platforms/xcb/xcb-plugin.pro
Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79
Diffstat (limited to 'tests/auto/corelib/json')
-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> |