Regenerate tests/auto/corelib/serialization

Change-Id: Id2e221e4018b46467203c8d6f29a9758c3c57a60
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
bb10
Alexandru Croitor 2019-11-12 14:12:24 +01:00
parent 5c1bb8e4d4
commit 2718f5928e
5 changed files with 31 additions and 29 deletions

View File

@ -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()

View File

@ -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()

View File

@ -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
)

View File

@ -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
)

View File

@ -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
)