diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-12 19:47:41 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-17 13:34:30 +0200 |
| commit | 63434c07fbe4e3d8735a9e28200ce9b3b121bec8 (patch) | |
| tree | 78df0fc26c49814600e9ebef1272e60c3951a456 /tests/auto/qmake/testdata | |
| parent | 6de735b5793aa1c5ddcba65b1110d3f9e1c64d1d (diff) | |
fix QMAKE_SUBSTITUTES with shadow builds
still doesn't work for nested directories, but that's because
fileFixify() is plain broken.
on the way, remove a superfluous check: we know that the input file name
ends with .in - three lines up we made sure it does.
Reviewed-by: joerg
Diffstat (limited to 'tests/auto/qmake/testdata')
4 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qmake/testdata/substitutes/sub/test2.in b/tests/auto/qmake/testdata/substitutes/sub/test2.in new file mode 100644 index 0000000000..78a60695ae --- /dev/null +++ b/tests/auto/qmake/testdata/substitutes/sub/test2.in @@ -0,0 +1 @@ +heya diff --git a/tests/auto/qmake/testdata/substitutes/test.in b/tests/auto/qmake/testdata/substitutes/test.in new file mode 100644 index 0000000000..2fa05e0110 --- /dev/null +++ b/tests/auto/qmake/testdata/substitutes/test.in @@ -0,0 +1,2 @@ +test +tst diff --git a/tests/auto/qmake/testdata/substitutes/test.pro b/tests/auto/qmake/testdata/substitutes/test.pro new file mode 100644 index 0000000000..5bce312e9a --- /dev/null +++ b/tests/auto/qmake/testdata/substitutes/test.pro @@ -0,0 +1,2 @@ +QMAKE_SUBSTITUTES += test.in +# doesn't work for the time being: sub/test2.in diff --git a/tests/auto/qmake/testdata/substitutes_build/README b/tests/auto/qmake/testdata/substitutes_build/README new file mode 100644 index 0000000000..81dc596e5b --- /dev/null +++ b/tests/auto/qmake/testdata/substitutes_build/README @@ -0,0 +1 @@ +Placeholder file to ensure this directory exists |