diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-16 14:10:51 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-17 16:12:06 +1000 |
| commit | edb3480202b762860913e5a7b9f5eafe8bda5eff (patch) | |
| tree | 60749d5f9352a253616655e98e409c8ee3a15c54 /tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro | |
| parent | b4b2970a75655ef28b3564c031768c767d6fd071 (diff) | |
| download | qt4-tools-edb3480202b762860913e5a7b9f5eafe8bda5eff.tar.gz | |
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/qhelpcontentmodel/qhelpcontentmodel.pro')
| -rw-r--r-- | tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro b/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro index 79bb44c799..889aac9728 100644 --- a/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro +++ b/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro @@ -1,10 +1,22 @@ -TEMPLATE = subdirs -CONFIG += ordered +load(qttest_p4) +SOURCES += tst_qhelpcontentmodel.cpp -contains(QT_BUILD_PARTS, tools): { - SUBDIRS += ../../../tools/assistant/lib/fulltextsearch \ - ../../../tools/assistant/lib -} +CONFIG += help -SUBDIRS += tst_qhelpcontentmodel.pro +DEFINES += QT_USE_USING_NAMESPACE +!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS +wince*: { + DEFINES += SRCDIR=\\\"./\\\" + QT += network + addFiles.sources = $$PWD/data/*.* + addFiles.path = data + clucene.sources = $$QT_BUILD_TREE/lib/QtCLucene*.dll + + DEPLOYMENT += addFiles + DEPLOYMENT += clucene + + DEPLOYMENT_PLUGIN += qsqlite +} else { + DEFINES += SRCDIR=\\\"$$PWD\\\" +}
\ No newline at end of file |