diff options
| -rw-r--r-- | mkspecs/features/testcase.prf | 22 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qresourceengine/qresourceengine.pro | 9 |
2 files changed, 23 insertions, 8 deletions
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index 10f421a8e2..40ec7cff30 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -134,6 +134,28 @@ contains(INSTALLS, target) { INSTALLS += $$tdi } + # Install GENERATED_TESTDATA. + # Logic is copied from the TESTDATA installation, only difference being that + # INSTALL target is added with CONFIG = no_check_exist + for(file, GENERATED_TESTDATA) { + tnam = $$file + tnam ~= s,\\.\\.,dotdot, + tnam ~= s,[?*],wildcard, + tnam ~= s,[^A-Za-z0-9],_, + tdi = testdata_$$tnam + tdif = $${tdi}.files + tdip = $${tdi}.path + tdic = $${tdi}.CONFIG + + $$tdif = $$file + $$tdic = no_check_exist + + file = $$replace(file, ^(\\.\\./)+, ) + $$tdip = $${target.path}/$$dirname(file) + + INSTALLS += $$tdi + } + # TEST_HELPER_INSTALLS specifies additional test helper executables for installation. # # Typical usage is: diff --git a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro index b9e17f7418..b7606eb3fc 100644 --- a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro +++ b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro @@ -14,12 +14,5 @@ PRE_TARGETDEPS += $${runtime_resource.target} TESTDATA += \ parentdir.txt \ testqrc/* - -# Special case needed for runtime_resource.rcc installation, -# since it does not exist at qmake runtime. -load(testcase) # to get value of target.path -runtime_resource_install.CONFIG = no_check_exist -runtime_resource_install.files = $$OUT_PWD/$${runtime_resource.target} -runtime_resource_install.path = $${target.path} -INSTALLS += runtime_resource_install +GENERATED_TESTDATA = $${runtime_resource.target} DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |