Cleanup tests that add test data to resources explicitly

Remove Integrity and Android specific code that explicitly adds
test data to the resource files. qt_internal_add_test functions
implicitly adds test data to resources for Android and Integrity
platforms by default.

Change-Id: Ia1d58755b47442e1953462e38606f70fec262368
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2022-02-10 20:21:30 +01:00
parent fdf5d11ff6
commit 815bc61626
19 changed files with 24 additions and 591 deletions

View File

@ -14,23 +14,3 @@ qt_internal_add_test(tst_qiodevice
Qt::Network
TESTDATA ${test_data}
)
#### Keys ignored in scope 1:.:.:qiodevice.pro:<TRUE>:
# MOC_DIR = "tmp"
## Scopes:
#####################################################################
if(ANDROID)
# Resources:
set(android_testdata_resource_files
"tst_qiodevice.cpp"
)
qt_internal_add_resource(tst_qiodevice "android_testdata"
PREFIX
"/"
FILES
${android_testdata_resource_files}
)
endif()

View File

@ -14,23 +14,3 @@ qt_internal_add_test(tst_qloggingregistry
Qt::CorePrivate
TESTDATA ${test_data}
)
#### Keys ignored in scope 1:.:.:qloggingregistry.pro:<TRUE>:
# TEMPLATE = "app"
## Scopes:
#####################################################################
if(ANDROID)
# Resources:
set(android_testdata_resource_files
"qtlogging.ini"
)
qt_internal_add_resource(tst_qloggingregistry "android_testdata"
PREFIX
"/"
FILES
${android_testdata_resource_files}
)
endif()

View File

@ -21,23 +21,6 @@ qt_internal_add_test(tst_qmetatype
TESTDATA ${test_data}
)
if(INTEGRITY)
# Resources:
set(testdata_resource_files
"typeFlags.bin"
)
qt_internal_add_resource(tst_qmetatype "testdata"
PREFIX
"/"
FILES
${testdata_resource_files}
)
endif()
## Scopes:
#####################################################################
qt_internal_extend_target(tst_qmetatype CONDITION MSVC
COMPILE_OPTIONS
/bigobj

View File

@ -4,39 +4,24 @@
## tst_json Test:
#####################################################################
set(json_resource_files
"bom.json"
"test.json"
"test2.json"
"test3.json"
"simple.duplicates.json"
"test.duplicates.json"
"test3.duplicates.json"
)
qt_internal_add_test(tst_json
SOURCES
tst_qtjson.cpp
PUBLIC_LIBRARIES
Qt::CorePrivate
TESTDATA ${json_resource_files}
)
## Scopes:
#####################################################################
#### Keys ignored in scope 2:.:.:json.pro:NOT ANDROID:
# TESTDATA = "bom.json" "test.json" "test3.json" "test2.json"
if(ANDROID OR INTEGRITY)
# Resources:
set(json_resource_files
"bom.json"
"test.json"
"test2.json"
"test3.json"
"simple.duplicates.json"
"test.duplicates.json"
"test3.duplicates.json"
)
qt_internal_add_resource(tst_json "json"
PREFIX
"/"
FILES
${json_resource_files}
)
endif()
qt_internal_extend_target(tst_json CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
DEFINES
QT_NO_DOUBLECONVERSION

View File

@ -15,21 +15,3 @@ qt_internal_add_test(tst_qdatastream
Qt::Gui
TESTDATA ${test_data}
)
## Scopes:
#####################################################################
if(ANDROID OR INTEGRITY)
# Resources:
set(testdata_resource_files
"datastream.q42"
"typedef.q5"
)
qt_internal_add_resource(tst_qdatastream "testdata"
PREFIX
"/"
FILES
${testdata_resource_files}
)
endif()

View File

@ -36,28 +36,6 @@ qt_internal_add_resource(tst_qtextstream "qtextstream"
${qtextstream_resource_files}
)
if(INTEGRITY)
set(qtextstream_resource_files_integrity
"../rfc3261.txt"
"../task113817.txt"
"../tst_qtextstream.cpp"
)
qt_internal_add_resource(tst_qtextstream "qtextstream_integrity"
PREFIX
"/"
FILES
${qtextstream_resource_files_integrity}
)
endif()
## Scopes:
qt_internal_extend_target(tst_qtextstream CONDITION builtin_testdata OR INTEGRITY
DEFINES
BUILTIN_TESTDATA
)
if(QT_FEATURE_process)
add_dependencies(tst_qtextstream stdinProcess readAllStdinProcess readLineStdinProcess)
add_dependencies(tst_qtextstream stdinProcess readAllStdinProcess readLineStdinProcess)
endif()

View File

@ -24,17 +24,3 @@ qt_internal_extend_target(tst_qbytearray CONDITION APPLE
PUBLIC_LIBRARIES
${FWFoundation}
)
if(ANDROID OR INTEGRITY)
# Resources:
set(testdata_resource_files
"rfc3252.txt"
)
qt_internal_add_resource(tst_qbytearray "testdata"
PREFIX
"/"
FILES
${testdata_resource_files}
)
endif()

View File

@ -14,20 +14,3 @@ qt_internal_add_test(tst_qchar
Qt::CorePrivate
TESTDATA ${test_data}
)
## Scopes:
#####################################################################
if(ANDROID OR INTEGRITY)
# Resources:
set(testdata_resource_files
"data/NormalizationTest.txt"
)
qt_internal_add_resource(tst_qchar "testdata"
PREFIX
"/"
FILES
${testdata_resource_files}
)
endif()

View File

@ -11,17 +11,3 @@ qt_internal_add_test(tst_qstringconverter
tst_qstringconverter.cpp
TESTDATA ${test_data}
)
if(INTEGRITY)
# Resources:
set(testdata_resource_files
"utf8.txt"
)
qt_internal_add_resource(tst_qstringconverter "testdata"
PREFIX
"/"
FILES
${testdata_resource_files}
)
endif()

View File

@ -5,30 +5,13 @@
#####################################################################
# Collect test data
list(APPEND test_data "data")
file(GLOB_RECURSE test_data
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
data/*
)
qt_internal_add_test(tst_qtextboundaryfinder
SOURCES
tst_qtextboundaryfinder.cpp
TESTDATA ${test_data}
)
## Scopes:
#####################################################################
if(ANDROID)
# Resources:
set(testdata_resource_files
"data/GraphemeBreakTest.txt"
"data/LineBreakTest.txt"
"data/SentenceBreakTest.txt"
"data/WordBreakTest.txt"
)
qt_internal_add_resource(tst_qtextboundaryfinder "testdata"
PREFIX
"/"
FILES
${testdata_resource_files}
)
endif()

View File

@ -15,21 +15,3 @@ qt_internal_add_test(tst_qcryptographichash
tst_qcryptographichash.cpp
TESTDATA ${test_data}
)
## Scopes:
#####################################################################
if(ANDROID OR INTEGRITY)
# Resources:
set(testdata_resource_files
"data/2c1517dad3678f03917f15849b052fd5.md5"
"data/d41d8cd98f00b204e9800998ecf8427e.md5"
)
qt_internal_add_resource(tst_qcryptographichash "testdata"
PREFIX
"/"
FILES
${testdata_resource_files}
)
endif()

View File

@ -18,32 +18,3 @@ qt_internal_add_test(tst_qicoimageformat
TESTDATA ${test_data}
)
## Scopes:
#####################################################################
if(ANDROID)
# Resources:
set(qicoimageformat_resource_files
"icons/invalid/35floppy.ico"
"icons/valid/35FLOPPY.ICO"
"icons/valid/AddPerfMon.ico"
"icons/valid/App.ico"
"icons/valid/Obj_N2_Internal_Mem.ico"
"icons/valid/Qt.ico"
"icons/valid/Status_Play.ico"
"icons/valid/TIMER01.ICO"
"icons/valid/WORLD.ico"
"icons/valid/WORLDH.ico"
"icons/valid/abcardWindow.ico"
"icons/valid/semitransparent.ico"
"icons/valid/trolltechlogo_tiny.ico"
"icons/valid/yellow.cur"
)
qt_internal_add_resource(tst_qicoimageformat "qicoimageformat"
PREFIX
"/"
FILES
${qicoimageformat_resource_files}
)
endif()

View File

@ -20,40 +20,6 @@ qt_internal_add_test(tst_qimage
TESTDATA ${test_data}
)
## Scopes:
#####################################################################
if(ANDROID)
# Resources:
set(qimage_resource_files
"images/image.bmp"
"images/image.gif"
"images/image.ico"
"images/image.jpg"
"images/image.pbm"
"images/image.pgm"
"images/image.png"
"images/image.ppm"
"images/image.xbm"
"images/image.xpm"
"images/jpeg_exif_orientation_value_1.jpg"
"images/jpeg_exif_orientation_value_2.jpg"
"images/jpeg_exif_orientation_value_3.jpg"
"images/jpeg_exif_orientation_value_4.jpg"
"images/jpeg_exif_orientation_value_5.jpg"
"images/jpeg_exif_orientation_value_6.jpg"
"images/jpeg_exif_orientation_value_7.jpg"
"images/jpeg_exif_orientation_value_8.jpg"
)
qt_internal_add_resource(tst_qimage "qimage"
PREFIX
"/"
FILES
${qimage_resource_files}
)
endif()
qt_internal_extend_target(tst_qimage CONDITION WIN32
PUBLIC_LIBRARIES
gdi32

View File

@ -42,24 +42,3 @@ qt_internal_add_resource(tst_qimagereader "qmake_immediate"
${qmake_immediate_resource_files}
)
#### Keys ignored in scope 1:.:.:qimagereader.pro:<TRUE>:
# MOC_DIR = "tmp"
## Scopes:
#####################################################################
if(ANDROID)
# Resources:
set(android_testdata_resource_files
"images/kollada-noext"
"images/trans.gif"
)
qt_internal_add_resource(tst_qimagereader "android_testdata"
PREFIX
"/"
FILES
${android_testdata_resource_files}
)
endif()

View File

@ -18,33 +18,3 @@ qt_internal_add_test(tst_qimagewriter
TESTDATA ${test_data}
)
#### Keys ignored in scope 1:.:.:qimagewriter.pro:<TRUE>:
# MOC_DIR = "tmp"
## Scopes:
#####################################################################
if(ANDROID)
# Resources:
set(qimagewriter_resource_files
"images/YCbCr_cmyk.jpg"
"images/YCbCr_rgb.jpg"
"images/beavis.jpg"
"images/colorful.bmp"
"images/earth.gif"
"images/font.bmp"
"images/gnus.xbm"
"images/kollada.png"
"images/marble.xpm"
"images/ship63.pbm"
"images/teapot.ppm"
"images/trolltech.gif"
)
qt_internal_add_resource(tst_qimagewriter "qimagewriter"
PREFIX
"/"
FILES
${qimagewriter_resource_files}
)
endif()

View File

@ -41,198 +41,3 @@ qt_internal_extend_target(tst_qpainter CONDITION TARGET Qt::Widgets
Qt::Widgets
Qt::WidgetsPrivate
)
if(ANDROID)
# Resources:
set(testdata_resource_files
"drawEllipse/10x10SizeAt0x0.png"
"drawEllipse/10x10SizeAt100x100.png"
"drawEllipse/10x10SizeAt200x200.png"
"drawEllipse/13x100SizeAt0x0.png"
"drawEllipse/13x100SizeAt100x100.png"
"drawEllipse/13x100SizeAt200x200.png"
"drawEllipse/200x200SizeAt0x0.png"
"drawEllipse/200x200SizeAt100x100.png"
"drawEllipse/200x200SizeAt200x200.png"
"drawLine_rop_bitmap/dst.xbm"
"drawLine_rop_bitmap/res/res_AndNotROP.xbm"
"drawLine_rop_bitmap/res/res_AndROP.xbm"
"drawLine_rop_bitmap/res/res_ClearROP.xbm"
"drawLine_rop_bitmap/res/res_CopyROP.xbm"
"drawLine_rop_bitmap/res/res_NandROP.xbm"
"drawLine_rop_bitmap/res/res_NopROP.xbm"
"drawLine_rop_bitmap/res/res_NorROP.xbm"
"drawLine_rop_bitmap/res/res_NotAndROP.xbm"
"drawLine_rop_bitmap/res/res_NotCopyROP.xbm"
"drawLine_rop_bitmap/res/res_NotOrROP.xbm"
"drawLine_rop_bitmap/res/res_NotROP.xbm"
"drawLine_rop_bitmap/res/res_NotXorROP.xbm"
"drawLine_rop_bitmap/res/res_OrNotROP.xbm"
"drawLine_rop_bitmap/res/res_OrROP.xbm"
"drawLine_rop_bitmap/res/res_SetROP.xbm"
"drawLine_rop_bitmap/res/res_XorROP.xbm"
"drawPixmap_rop/dst1.png"
"drawPixmap_rop/dst2.png"
"drawPixmap_rop/dst3.png"
"drawPixmap_rop/res/res_AndNotROP0.png"
"drawPixmap_rop/res/res_AndNotROP1.png"
"drawPixmap_rop/res/res_AndNotROP2.png"
"drawPixmap_rop/res/res_AndNotROP3.png"
"drawPixmap_rop/res/res_AndNotROP4.png"
"drawPixmap_rop/res/res_AndNotROP5.png"
"drawPixmap_rop/res/res_AndNotROP6.png"
"drawPixmap_rop/res/res_AndNotROP7.png"
"drawPixmap_rop/res/res_AndROP0.png"
"drawPixmap_rop/res/res_AndROP1.png"
"drawPixmap_rop/res/res_AndROP2.png"
"drawPixmap_rop/res/res_AndROP3.png"
"drawPixmap_rop/res/res_AndROP4.png"
"drawPixmap_rop/res/res_AndROP5.png"
"drawPixmap_rop/res/res_AndROP6.png"
"drawPixmap_rop/res/res_AndROP7.png"
"drawPixmap_rop/res/res_ClearROP0.png"
"drawPixmap_rop/res/res_ClearROP1.png"
"drawPixmap_rop/res/res_ClearROP2.png"
"drawPixmap_rop/res/res_ClearROP3.png"
"drawPixmap_rop/res/res_ClearROP4.png"
"drawPixmap_rop/res/res_ClearROP5.png"
"drawPixmap_rop/res/res_ClearROP6.png"
"drawPixmap_rop/res/res_ClearROP7.png"
"drawPixmap_rop/res/res_CopyROP0.png"
"drawPixmap_rop/res/res_CopyROP1.png"
"drawPixmap_rop/res/res_CopyROP2.png"
"drawPixmap_rop/res/res_CopyROP3.png"
"drawPixmap_rop/res/res_CopyROP4.png"
"drawPixmap_rop/res/res_CopyROP5.png"
"drawPixmap_rop/res/res_CopyROP6.png"
"drawPixmap_rop/res/res_CopyROP7.png"
"drawPixmap_rop/res/res_NandROP0.png"
"drawPixmap_rop/res/res_NandROP1.png"
"drawPixmap_rop/res/res_NandROP2.png"
"drawPixmap_rop/res/res_NandROP3.png"
"drawPixmap_rop/res/res_NandROP4.png"
"drawPixmap_rop/res/res_NandROP5.png"
"drawPixmap_rop/res/res_NandROP6.png"
"drawPixmap_rop/res/res_NandROP7.png"
"drawPixmap_rop/res/res_NopROP0.png"
"drawPixmap_rop/res/res_NopROP1.png"
"drawPixmap_rop/res/res_NopROP2.png"
"drawPixmap_rop/res/res_NopROP3.png"
"drawPixmap_rop/res/res_NopROP4.png"
"drawPixmap_rop/res/res_NopROP5.png"
"drawPixmap_rop/res/res_NopROP6.png"
"drawPixmap_rop/res/res_NopROP7.png"
"drawPixmap_rop/res/res_NorROP0.png"
"drawPixmap_rop/res/res_NorROP1.png"
"drawPixmap_rop/res/res_NorROP2.png"
"drawPixmap_rop/res/res_NorROP3.png"
"drawPixmap_rop/res/res_NorROP4.png"
"drawPixmap_rop/res/res_NorROP5.png"
"drawPixmap_rop/res/res_NorROP6.png"
"drawPixmap_rop/res/res_NorROP7.png"
"drawPixmap_rop/res/res_NotAndROP0.png"
"drawPixmap_rop/res/res_NotAndROP1.png"
"drawPixmap_rop/res/res_NotAndROP2.png"
"drawPixmap_rop/res/res_NotAndROP3.png"
"drawPixmap_rop/res/res_NotAndROP4.png"
"drawPixmap_rop/res/res_NotAndROP5.png"
"drawPixmap_rop/res/res_NotAndROP6.png"
"drawPixmap_rop/res/res_NotAndROP7.png"
"drawPixmap_rop/res/res_NotCopyROP0.png"
"drawPixmap_rop/res/res_NotCopyROP1.png"
"drawPixmap_rop/res/res_NotCopyROP2.png"
"drawPixmap_rop/res/res_NotCopyROP3.png"
"drawPixmap_rop/res/res_NotCopyROP4.png"
"drawPixmap_rop/res/res_NotCopyROP5.png"
"drawPixmap_rop/res/res_NotCopyROP6.png"
"drawPixmap_rop/res/res_NotCopyROP7.png"
"drawPixmap_rop/res/res_NotOrROP0.png"
"drawPixmap_rop/res/res_NotOrROP1.png"
"drawPixmap_rop/res/res_NotOrROP2.png"
"drawPixmap_rop/res/res_NotOrROP3.png"
"drawPixmap_rop/res/res_NotOrROP4.png"
"drawPixmap_rop/res/res_NotOrROP5.png"
"drawPixmap_rop/res/res_NotOrROP6.png"
"drawPixmap_rop/res/res_NotOrROP7.png"
"drawPixmap_rop/res/res_NotROP0.png"
"drawPixmap_rop/res/res_NotROP1.png"
"drawPixmap_rop/res/res_NotROP2.png"
"drawPixmap_rop/res/res_NotROP3.png"
"drawPixmap_rop/res/res_NotROP4.png"
"drawPixmap_rop/res/res_NotROP5.png"
"drawPixmap_rop/res/res_NotROP6.png"
"drawPixmap_rop/res/res_NotROP7.png"
"drawPixmap_rop/res/res_NotXorROP0.png"
"drawPixmap_rop/res/res_NotXorROP1.png"
"drawPixmap_rop/res/res_NotXorROP2.png"
"drawPixmap_rop/res/res_NotXorROP3.png"
"drawPixmap_rop/res/res_NotXorROP4.png"
"drawPixmap_rop/res/res_NotXorROP5.png"
"drawPixmap_rop/res/res_NotXorROP6.png"
"drawPixmap_rop/res/res_NotXorROP7.png"
"drawPixmap_rop/res/res_OrNotROP0.png"
"drawPixmap_rop/res/res_OrNotROP1.png"
"drawPixmap_rop/res/res_OrNotROP2.png"
"drawPixmap_rop/res/res_OrNotROP3.png"
"drawPixmap_rop/res/res_OrNotROP4.png"
"drawPixmap_rop/res/res_OrNotROP5.png"
"drawPixmap_rop/res/res_OrNotROP6.png"
"drawPixmap_rop/res/res_OrNotROP7.png"
"drawPixmap_rop/res/res_OrROP0.png"
"drawPixmap_rop/res/res_OrROP1.png"
"drawPixmap_rop/res/res_OrROP2.png"
"drawPixmap_rop/res/res_OrROP3.png"
"drawPixmap_rop/res/res_OrROP4.png"
"drawPixmap_rop/res/res_OrROP5.png"
"drawPixmap_rop/res/res_OrROP6.png"
"drawPixmap_rop/res/res_OrROP7.png"
"drawPixmap_rop/res/res_SetROP0.png"
"drawPixmap_rop/res/res_SetROP1.png"
"drawPixmap_rop/res/res_SetROP2.png"
"drawPixmap_rop/res/res_SetROP3.png"
"drawPixmap_rop/res/res_SetROP4.png"
"drawPixmap_rop/res/res_SetROP5.png"
"drawPixmap_rop/res/res_SetROP6.png"
"drawPixmap_rop/res/res_SetROP7.png"
"drawPixmap_rop/res/res_XorROP0.png"
"drawPixmap_rop/res/res_XorROP1.png"
"drawPixmap_rop/res/res_XorROP2.png"
"drawPixmap_rop/res/res_XorROP3.png"
"drawPixmap_rop/res/res_XorROP4.png"
"drawPixmap_rop/res/res_XorROP5.png"
"drawPixmap_rop/res/res_XorROP6.png"
"drawPixmap_rop/res/res_XorROP7.png"
"drawPixmap_rop/src1.xbm"
"drawPixmap_rop/src2-mask.xbm"
"drawPixmap_rop/src2.xbm"
"drawPixmap_rop/src3.xbm"
"drawPixmap_rop_bitmap/dst.xbm"
"drawPixmap_rop_bitmap/res/res_AndNotROP.xbm"
"drawPixmap_rop_bitmap/res/res_AndROP.xbm"
"drawPixmap_rop_bitmap/res/res_ClearROP.xbm"
"drawPixmap_rop_bitmap/res/res_CopyROP.xbm"
"drawPixmap_rop_bitmap/res/res_NandROP.xbm"
"drawPixmap_rop_bitmap/res/res_NopROP.xbm"
"drawPixmap_rop_bitmap/res/res_NorROP.xbm"
"drawPixmap_rop_bitmap/res/res_NotAndROP.xbm"
"drawPixmap_rop_bitmap/res/res_NotCopyROP.xbm"
"drawPixmap_rop_bitmap/res/res_NotOrROP.xbm"
"drawPixmap_rop_bitmap/res/res_NotROP.xbm"
"drawPixmap_rop_bitmap/res/res_NotXorROP.xbm"
"drawPixmap_rop_bitmap/res/res_OrNotROP.xbm"
"drawPixmap_rop_bitmap/res/res_OrROP.xbm"
"drawPixmap_rop_bitmap/res/res_SetROP.xbm"
"drawPixmap_rop_bitmap/res/res_XorROP.xbm"
"drawPixmap_rop_bitmap/src1-mask.xbm"
"drawPixmap_rop_bitmap/src1.xbm"
"drawPixmap_rop_bitmap/src2.xbm"
"task217400.png"
)
qt_internal_add_resource(tst_qpainter "testdata"
PREFIX
"/"
FILES
${testdata_resource_files}
)
endif()

View File

@ -1,15 +1,14 @@
# Generated from qcssparser.pro.
if(NOT QT_FEATURE_private_tests)
return()
endif()
#####################################################################
## tst_qcssparser Test:
#####################################################################
# Collect test data
list(APPEND test_data "testdata")
file(GLOB_RECURSE test_data
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
testdata/*
)
qt_internal_add_test(tst_qcssparser
SOURCES
@ -20,36 +19,3 @@ qt_internal_add_test(tst_qcssparser
Qt::Xml
TESTDATA ${test_data}
)
#### Keys ignored in scope 1:.:.:qcssparser.pro:<TRUE>:
# _REQUIREMENTS = "qtConfig(private_tests)"
## Scopes:
#####################################################################
if(ANDROID)
# Resources:
set(testdata_resource_files
"testdata/scanner/comments/input"
"testdata/scanner/comments/output"
"testdata/scanner/comments2/input"
"testdata/scanner/comments2/output"
"testdata/scanner/comments3/input"
"testdata/scanner/comments3/output"
"testdata/scanner/comments4/input"
"testdata/scanner/comments4/output"
"testdata/scanner/quotedstring/input"
"testdata/scanner/quotedstring/output"
"testdata/scanner/simple/input"
"testdata/scanner/simple/output"
"testdata/scanner/unicode/input"
"testdata/scanner/unicode/output"
)
qt_internal_add_resource(tst_qcssparser "testdata"
PREFIX
"/"
FILES
${testdata_resource_files}
)
endif()

View File

@ -5,7 +5,10 @@
#####################################################################
# Collect test data
list(APPEND test_data "testdata")
file(GLOB_RECURSE test_data
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
testdata/*
)
qt_internal_add_test(tst_qzip
SOURCES
@ -15,21 +18,3 @@ qt_internal_add_test(tst_qzip
Qt::GuiPrivate
TESTDATA ${test_data}
)
## Scopes:
#####################################################################
if(ANDROID)
# Resources:
set(testdata_resource_files
"testdata/symlink.zip"
"testdata/test.zip"
)
qt_internal_add_resource(tst_qzip "testdata"
PREFIX
"/"
FILES
${testdata_resource_files}
)
endif()

View File

@ -20,20 +20,3 @@ qt_internal_add_test(tst_qlayout
Qt::WidgetsPrivate
TESTDATA ${test_data}
)
## Scopes:
#####################################################################
if(ANDROID)
# Resources:
set(testdata_resource_files
"baseline/smartmaxsize"
)
qt_internal_add_resource(tst_qlayout "testdata"
PREFIX
"/"
FILES
${testdata_resource_files}
)
endif()