summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmake
diff options
context:
space:
mode:
authorKeith Isdale <keith.isdale@nokia.com>2009-08-31 07:18:10 (GMT)
committerKeith Isdale <keith.isdale@nokia.com>2009-08-31 07:18:10 (GMT)
commitcdb689777841e40d6b017f3e57bcce62992c10b6 (patch)
treec53f896c7213cd5c72a5267b8ec08b038326a667 /tests/auto/qmake
parentf25f5b41a620b6d46e78eb97e3b2784c646493d0 (diff)
downloadQt-cdb689777841e40d6b017f3e57bcce62992c10b6.zip
Qt-cdb689777841e40d6b017f3e57bcce62992c10b6.tar.gz
Qt-cdb689777841e40d6b017f3e57bcce62992c10b6.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
Diffstat (limited to 'tests/auto/qmake')
-rw-r--r--tests/auto/qmake/testdata/findDeps/findDeps.pro7
-rw-r--r--tests/auto/qmake/testdata/findMocs/findMocs.pro7
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