summaryrefslogtreecommitdiffstats
path: root/tests/auto/qhelpprojectdata
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2010-02-16 04:10:51 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2010-02-17 06:12:06 (GMT)
commitedb3480202b762860913e5a7b9f5eafe8bda5eff (patch)
tree60749d5f9352a253616655e98e409c8ee3a15c54 /tests/auto/qhelpprojectdata
parentb4b2970a75655ef28b3564c031768c767d6fd071 (diff)
downloadQt-edb3480202b762860913e5a7b9f5eafe8bda5eff.zip
Qt-edb3480202b762860913e5a7b9f5eafe8bda5eff.tar.gz
Qt-edb3480202b762860913e5a7b9f5eafe8bda5eff.tar.bz2
Fixed compile of QtHelp tests with vcproj generator.
These tests were doing: SUBDIRS+=../../../tools/assistant/lib ... to ensure that part of Qt was built before building the test. That's a cute hack, but it's a bad idea: it breaks the vcproj generator to process the same subdir multiple times, and it also gives the very unintuitive result that doing `make clean' under tests/auto cleans out a part of the Qt build!
Diffstat (limited to 'tests/auto/qhelpprojectdata')
-rw-r--r--tests/auto/qhelpprojectdata/qhelpprojectdata.pro13
-rw-r--r--tests/auto/qhelpprojectdata/tst_qhelpprojectdata.pro9
2 files changed, 6 insertions, 16 deletions
diff --git a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
index 9617416..92dc620 100644
--- a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
+++ b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
@@ -1,10 +1,9 @@
-TEMPLATE = subdirs
-CONFIG += ordered
+load(qttest_p4)
-contains(QT_BUILD_PARTS, tools): {
- SUBDIRS += ../../../tools/assistant/lib/fulltextsearch \
- ../../../tools/assistant/lib
-}
+SOURCES += tst_qhelpprojectdata.cpp
+CONFIG += help
-SUBDIRS += tst_qhelpprojectdata.pro
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+DEFINES += QT_USE_USING_NAMESPACE
+!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
diff --git a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.pro b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.pro
deleted file mode 100644
index 92dc620..0000000
--- a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-
-SOURCES += tst_qhelpprojectdata.cpp
-CONFIG += help
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-DEFINES += QT_USE_USING_NAMESPACE
-!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
-