diff options
5 files changed, 31 insertions, 29 deletions
diff --git a/tests/auto/corelib/serialization/json/CMakeLists.txt b/tests/auto/corelib/serialization/json/CMakeLists.txt index 536f07f68f..92d7210842 100644 --- a/tests/auto/corelib/serialization/json/CMakeLists.txt +++ b/tests/auto/corelib/serialization/json/CMakeLists.txt @@ -17,19 +17,20 @@ add_qt_test(tst_json #### Keys ignored in scope 2:.:.:json.pro:NOT ANDROID: # TESTDATA = "bom.json" "test.json" "test.bjson" "test3.json" "test2.json" -# Resources: -set(json_resource_files - "bom.json" - "test.bjson" - "test.json" - "test2.json" - "test3.json" -) - -add_qt_resource(tst_json "json" - PREFIX - "/" - FILES - ${json_resource_files} -) +if(ANDROID) + # Resources: + set(json_resource_files + "bom.json" + "test.bjson" + "test.json" + "test2.json" + "test3.json" + ) + add_qt_resource(tst_json "json" + PREFIX + "/" + FILES + ${json_resource_files} + ) +endif() diff --git a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt index 9847d831e7..a293f87155 100644 --- a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt @@ -18,15 +18,16 @@ add_qt_test(tst_qdatastream ## Scopes: ##################################################################### -# Resources: -set(testdata_resource_files - "datastream.q42" -) - -add_qt_resource(tst_qdatastream "testdata" - PREFIX - "/" - FILES - ${testdata_resource_files} -) +if(ANDROID AND NOT ANDROID_EMBEDDED) + # Resources: + set(testdata_resource_files + "datastream.q42" + ) + add_qt_resource(tst_qdatastream "testdata" + PREFIX + "/" + FILES + ${testdata_resource_files} + ) +endif() diff --git a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt index 1ab29aca7d..f377c97c2d 100644 --- a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt @@ -6,7 +6,7 @@ add_qt_executable(readAllStdinProcess INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/readAllStdinProcess" - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp ) diff --git a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt index 315b289102..ae899e55df 100644 --- a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt @@ -6,7 +6,7 @@ add_qt_executable(readLineStdinProcess INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/readLineStdinProcess" - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp ) diff --git a/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt index a25bbaf688..fed74b64c2 100644 --- a/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt @@ -6,7 +6,7 @@ add_qt_executable(stdinProcess INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/stdinProcess" - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp ) |