summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-24 17:22:23 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-26 08:14:17 +0200
commited96d199f197b2f82fa3ad19484a809ec1c0a4a4 (patch)
treea70358c353ff5479468a33fde1d280014326fffd /tests/auto/tools
parent9dc7f848392e374e1872063899bcbdcf369e9861 (diff)
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 <davidepesa@gmail.com> Reviewed-by: Andreas Hartmetz <ahartmetz@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tests/auto/tools')
-rw-r--r--tests/auto/tools/qmake/testdata/functions/functions.pro1
1 files changed, 1 insertions, 0 deletions
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 = " "