diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-18 23:24:24 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-18 23:24:24 (GMT) |
| commit | 9fbbd3146c42869d56da8c82501be1e6a6595f36 (patch) | |
| tree | 092af029342fa1c5a59bc30c85d7257c88718609 /tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro | |
| parent | 4baa9dfb5273d7b501dcb3f456983262c53cc8d1 (diff) | |
| parent | 52e517b50aafd6cc0bec597abd50d8b3f7e982dd (diff) | |
| download | Qt-9fbbd3146c42869d56da8c82501be1e6a6595f36.zip Qt-9fbbd3146c42869d56da8c82501be1e6a6595f36.tar.gz Qt-9fbbd3146c42869d56da8c82501be1e6a6595f36.tar.bz2 | |
Merge remote branch 'origin/4.6' into integration-master-from-4.6
Conflicts:
src/corelib/codecs/qtextcodec.h
Diffstat (limited to 'tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro')
| -rw-r--r-- | tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro | 22 |
1 files changed, 0 insertions, 22 deletions
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 |