diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-11-24 10:36:10 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-01 09:12:52 +0100 |
| commit | 3385fb91e1e55e1bfa1f78dfb8ce2e9f3fdaedef (patch) | |
| tree | b77bb527bf3a21dc95a317248b2640c73751f629 /tests/auto/corelib/io/qresourceengine/qresourceengine.pro | |
| parent | 13eba9ddf47d570fc4562c20fcfbacd1dfa4a61a (diff) | |
Fixed installation of corelib tests
In .pro files, removed wince/symbian-specific DEPLOYMENT cases and
replaced them with TESTDATA where appropriate.
In .cpp files, removed SRCDIR and relative paths to testdata and
replaced them with the QFINDTESTDATA macro where appropriate.
Modified test helper apps/libs to install themselves under the test
they relate to.
This change allows corelib tests to be correctly installed, along with
their testdata, via `make install'.
Change-Id: I5e202e2f3b577af7e39072d5c9fe13e0ca125304
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/corelib/io/qresourceengine/qresourceengine.pro')
| -rw-r--r-- | tests/auto/corelib/io/qresourceengine/qresourceengine.pro | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro index 1bb7bd9a90..d6e2cb3171 100644 --- a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro +++ b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro @@ -10,26 +10,14 @@ runtime_resource.commands = $$QMAKE_RCC -root /runtime_resource/ -binary $${runt QMAKE_EXTRA_TARGETS = runtime_resource PRE_TARGETDEPS += $${runtime_resource.target} -wince* { - deploy.files += runtime_resource.rcc parentdir.txt - test.files = testqrc/* - test.path = testqrc - alias.files = testqrc/aliasdir/* - alias.path = testqrc/aliasdir - other.files = testqrc/otherdir/* - other.path = testqrc/otherdir - search1.files = testqrc/searchpath1/* - search1.path = testqrc/searchpath1 - search2.files = testqrc/searchpath2/* - search2.path = testqrc/searchpath2 - sub.files = testqrc/subdir/* - sub.path = testqrc/subdir - testsub.files = testqrc/test/* - testsub.path = testqrc/test - testsub2.files = testqrc/test/test/* - testsub2.path = testqrc/test/test - DEPLOYMENT += deploy test alias other search1 search2 sub testsub testsub2 - DEFINES += SRCDIR=\\\"\\\" -} else { - DEFINES += SRCDIR=\\\"$$PWD/\\\" -} +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 |