From 588cbca5b77e507de08cd23a63d23edd4f45b22e Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Tue, 15 Sep 2020 11:16:43 +0300
Subject: Tests: fix json test for Android

test.bjon file doesn't exist, however, it's still included in json.qrc.
That causes the test to fail on Android because it's using that resource
file.

Change-Id: I1e93076069073a1a621459a7d90aec5c0c03f768
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 tests/auto/corelib/serialization/json/json.pro | 4 ++--
 tests/auto/corelib/serialization/json/json.qrc | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/corelib/serialization/json/json.pro b/tests/auto/corelib/serialization/json/json.pro
index 8fa17c5c38..2706bf9d5b 100644
--- a/tests/auto/corelib/serialization/json/json.pro
+++ b/tests/auto/corelib/serialization/json/json.pro
@@ -2,8 +2,8 @@ TARGET = tst_json
 QT = core-private testlib
 CONFIG += testcase
 
-!android:TESTDATA += bom.json test.json test.bjson test3.json test2.json
-    else:RESOURCES += json.qrc
+!android:TESTDATA += bom.json test.json test3.json test2.json
+else:RESOURCES += json.qrc
 
 !qtConfig(doubleconversion):!qtConfig(system-doubleconversion) {
     DEFINES += QT_NO_DOUBLECONVERSION
diff --git a/tests/auto/corelib/serialization/json/json.qrc b/tests/auto/corelib/serialization/json/json.qrc
index eb122a1779..49a6a95ecb 100644
--- a/tests/auto/corelib/serialization/json/json.qrc
+++ b/tests/auto/corelib/serialization/json/json.qrc
@@ -4,6 +4,5 @@
    <file>test2.json</file>
    <file>test3.json</file>
    <file>test.json</file>
-   <file>test.bjson</file>
 </qresource>
 </RCC>
-- 
cgit v1.2.3