diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-12 17:47:41 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-17 11:34:30 (GMT) |
| commit | 63434c07fbe4e3d8735a9e28200ce9b3b121bec8 (patch) | |
| tree | 78df0fc26c49814600e9ebef1272e60c3951a456 /tests/auto/qmake/testdata/substitutes | |
| parent | 6de735b5793aa1c5ddcba65b1110d3f9e1c64d1d (diff) | |
| download | Qt-63434c07fbe4e3d8735a9e28200ce9b3b121bec8.zip Qt-63434c07fbe4e3d8735a9e28200ce9b3b121bec8.tar.gz Qt-63434c07fbe4e3d8735a9e28200ce9b3b121bec8.tar.bz2 | |
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/substitutes')
| -rw-r--r-- | tests/auto/qmake/testdata/substitutes/sub/test2.in | 1 | ||||
| -rw-r--r-- | tests/auto/qmake/testdata/substitutes/test.in | 2 | ||||
| -rw-r--r-- | tests/auto/qmake/testdata/substitutes/test.pro | 2 |
3 files changed, 5 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 0000000..78a6069 --- /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 0000000..2fa05e0 --- /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 0000000..5bce312 --- /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 |