From ed96d199f197b2f82fa3ad19484a809ec1c0a4a4 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sun, 24 Jun 2012 17:22:23 +0200 Subject: fix somewhat common edge case in $$shadowed() if source and build dir are direct children of the common root and we are shadowing the top-level source dir, there is of course no trailing slash to match. Change-Id: I8a34a6a72d16cb21d77d056e037235af9b32a008 Reviewed-by: Davide Pesavento Reviewed-by: Andreas Hartmetz Reviewed-by: Joerg Bornemann Reviewed-by: Oswald Buddenhagen --- tests/auto/tools/qmake/testdata/functions/functions.pro | 1 + 1 file changed, 1 insertion(+) (limited to 'tests') diff --git a/tests/auto/tools/qmake/testdata/functions/functions.pro b/tests/auto/tools/qmake/testdata/functions/functions.pro index 9ec2ffe93f..daab1fd954 100644 --- a/tests/auto/tools/qmake/testdata/functions/functions.pro +++ b/tests/auto/tools/qmake/testdata/functions/functions.pro @@ -113,6 +113,7 @@ out = "easy \"less easy\" sca\$\${LITERAL_HASH}ry crazy\$\$escape_expand(\\\\t\\ testReplace($$val_escape(in), $$out, "val_escape") testReplace($$shadowed($$PWD/something), $$OUT_PWD/something, "shadowed") +testReplace($$shadowed($$PWD), $$OUT_PWD, "shadowed (take 2)") #format_number spc = " " -- cgit v1.2.3