summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2010-01-29 02:46:07 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2010-01-29 02:46:07 (GMT)
commit9c2ee0daafd159058d0804d4fc65a8ef1a4ed852 (patch)
tree9a8ec077039e58938ff65b4d655bf0fbc5bc8c6f
parent2f5f9ef4050fcb89e453fc427676f2320030b23b (diff)
downloadQt-9c2ee0daafd159058d0804d4fc65a8ef1a4ed852.zip
Qt-9c2ee0daafd159058d0804d4fc65a8ef1a4ed852.tar.gz
Qt-9c2ee0daafd159058d0804d4fc65a8ef1a4ed852.tar.bz2
Fixed `make test' for xmlpatternsxqts.
As far as I can tell, setting lib.file here is unnecessary, and it happens to break `make test'. The reason is that, on the first pass, qmake will generate Makefile.lib; then, when `make' is run, it will generate Makefile, and any additional parameters originally passed to qmake will be omitted.
-rw-r--r--tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
index 39267c8..3f49ccc 100644
--- a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
+++ b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
@@ -1,7 +1,6 @@
TEMPLATE = subdirs
contains(QT_CONFIG,xmlpatterns) {
SUBDIRS += lib
- !wince*:lib.file = lib/lib.pro
test.depends = lib
}
SUBDIRS += test