From a9090afbd05da3ab761d2c9f968a0f68eeba967c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 18 Nov 2015 12:14:10 +0100 Subject: [PATCH] remove now unnecessary indirections qt5 qmake is perfectly capable of complex expressions on the LHS. Change-Id: Ibf8c82a4aa1a419895c6012610269e1cc9ca93ab Reviewed-by: Joerg Bornemann --- mkspecs/features/testcase.prf | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index 6f6f073f70e..2f95aafd0aa 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -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 }