diff options
| author | Keith Isdale <keith.isdale@nokia.com> | 2009-08-31 07:18:10 (GMT) |
|---|---|---|
| committer | Keith Isdale <keith.isdale@nokia.com> | 2009-09-01 00:10:59 (GMT) |
| commit | 7a5d0d0b9f8b9203aa3921b2eb9fd7c77095c685 (patch) | |
| tree | b4b1a7c964c0452d5ce2094e02e12e4daa615b57 | |
| parent | eb80f2386d91e9bde23fc752ad25967e99cc10dc (diff) | |
| download | Qt-7a5d0d0b9f8b9203aa3921b2eb9fd7c77095c685.zip Qt-7a5d0d0b9f8b9203aa3921b2eb9fd7c77095c685.tar.gz Qt-7a5d0d0b9f8b9203aa3921b2eb9fd7c77095c685.tar.bz2 | |
Update the qmake autotest: re MSVC test failure findMocs and findDeps
When MSVC is used the default DESTDIR makes use a release/debug suffix.
For these tests DESTDIR needs to be "."/
Minor code cleanup was done whilst correcting these effected .pro files
Reviewed-by: Lincoln Ramsay
| -rw-r--r-- | tests/auto/qmake/testdata/findDeps/findDeps.pro | 7 | ||||
| -rw-r--r-- | tests/auto/qmake/testdata/findMocs/findMocs.pro | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/tests/auto/qmake/testdata/findDeps/findDeps.pro b/tests/auto/qmake/testdata/findDeps/findDeps.pro index e0a2b86..43577b5 100644 --- a/tests/auto/qmake/testdata/findDeps/findDeps.pro +++ b/tests/auto/qmake/testdata/findDeps/findDeps.pro @@ -1,11 +1,8 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Thu Mar 12 11:08:20 2009 -###################################################################### - TEMPLATE = app -TARGET = +TARGET = findDeps DEPENDPATH += . INCLUDEPATH += . +DESTDIR = ./ # Input HEADERS += object1.h \ diff --git a/tests/auto/qmake/testdata/findMocs/findMocs.pro b/tests/auto/qmake/testdata/findMocs/findMocs.pro index daa3c7f..1469b4c 100644 --- a/tests/auto/qmake/testdata/findMocs/findMocs.pro +++ b/tests/auto/qmake/testdata/findMocs/findMocs.pro @@ -1,11 +1,8 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Mar 11 16:11:09 2009 -###################################################################### - TEMPLATE = app -TARGET = +TARGET = findMocs DEPENDPATH += . INCLUDEPATH += . +DESTDIR = ./ # Input HEADERS += object1.h object2.h object3.h object4.h object5.h object6.h object7.h |