diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-16 04:10:51 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-17 06:12:06 (GMT) |
| commit | edb3480202b762860913e5a7b9f5eafe8bda5eff (patch) | |
| tree | 60749d5f9352a253616655e98e409c8ee3a15c54 /tests/auto/qhelpcontentmodel | |
| parent | b4b2970a75655ef28b3564c031768c767d6fd071 (diff) | |
| download | Qt-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/qhelpcontentmodel')
| -rw-r--r-- | tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro | 26 | ||||
| -rw-r--r-- | tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro | 22 |
2 files changed, 19 insertions, 29 deletions
diff --git a/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro b/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro index 79bb44c..889aac9 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 diff --git a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro b/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro deleted file mode 100644 index 889aac9..0000000 --- a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro +++ /dev/null @@ -1,22 +0,0 @@ -load(qttest_p4) -SOURCES += tst_qhelpcontentmodel.cpp - -CONFIG += help - -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 |