1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove now unnecessary indirections

Browse Source 
qt5 qmake is perfectly capable of complex expressions on the LHS.

Change-Id: Ibf8c82a4aa1a419895c6012610269e1cc9ca93ab
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-11-18 12:14:10 +01:00
parent 00648503bb
commit a9090afbd0
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mkspecs/features/testcase.prf
View File

@ -103,11 +103,9 @@ contains(INSTALLS, target) {
tnam ~= s,[?*],wildcard,
tnam ~= s,[^A-Za-z0-9],_,
tdi = testdata_$$tnam
tdif = $${tdi}.files
tdip = $${tdi}.path
# TESTDATA consists of the files to install (source)...
$$tdif = $$file
$${tdi}.files = $$file
# ... and the destination preserves the relative path.
# Strip any leading ../ from the testdata, so that installation does not escape
@ -123,7 +121,7 @@ contains(INSTALLS, target) {
# and testdata in the build and install tree, but should cover most cases.
#
file = $$replace(file, ^(\\.\\./)+, )
$$tdip = $${target.path}/$$dirname(file)
$${tdi}.path = $${target.path}/$$dirname(file)
INSTALLS += $$tdi
}
@ -137,15 +135,12 @@ contains(INSTALLS, target) {
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
$${tdi}.files = $$file
$${tdi}.CONFIG = no_check_exist
file = $$replace(file, ^(\\.\\./)+, )
$$tdip = $${target.path}/$$dirname(file)
$${tdi}.path = $${target.path}/$$dirname(file)
INSTALLS += $$tdi
}