diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-23 01:36:05 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-23 01:36:05 (GMT) |
| commit | 27f35a9cb588ad1dd595fafedc27e5a216bebf48 (patch) | |
| tree | 26aeebf20b725a340ad58b3411257fed7b626423 /tests/auto/qhelpgenerator | |
| parent | d7c472e23b678b2898d34a37166e61402818e271 (diff) | |
| parent | 14447cbbf7ee93e03286112b5b27d20961fd9551 (diff) | |
| download | Qt-27f35a9cb588ad1dd595fafedc27e5a216bebf48.zip Qt-27f35a9cb588ad1dd595fafedc27e5a216bebf48.tar.gz Qt-27f35a9cb588ad1dd595fafedc27e5a216bebf48.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'tests/auto/qhelpgenerator')
| -rw-r--r-- | tests/auto/qhelpgenerator/qhelpgenerator.pro | 15 | ||||
| -rw-r--r-- | tests/auto/qhelpgenerator/tst_qhelpgenerator.pro | 9 |
2 files changed, 7 insertions, 17 deletions
diff --git a/tests/auto/qhelpgenerator/qhelpgenerator.pro b/tests/auto/qhelpgenerator/qhelpgenerator.pro index efa1ef5..b4b07dd 100644 --- a/tests/auto/qhelpgenerator/qhelpgenerator.pro +++ b/tests/auto/qhelpgenerator/qhelpgenerator.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 -} - -SUBDIRS += tst_qhelpgenerator.pro +SOURCES += tst_qhelpgenerator.cpp +CONFIG += help +QT += sql +DEFINES += SRCDIR=\\\"$$PWD\\\" +DEFINES += QT_USE_USING_NAMESPACE +!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS diff --git a/tests/auto/qhelpgenerator/tst_qhelpgenerator.pro b/tests/auto/qhelpgenerator/tst_qhelpgenerator.pro deleted file mode 100644 index b4b07dd..0000000 --- a/tests/auto/qhelpgenerator/tst_qhelpgenerator.pro +++ /dev/null @@ -1,9 +0,0 @@ -load(qttest_p4) - -SOURCES += tst_qhelpgenerator.cpp -CONFIG += help -QT += sql - -DEFINES += SRCDIR=\\\"$$PWD\\\" -DEFINES += QT_USE_USING_NAMESPACE -!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS |