diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-12 17:04:45 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-12 10:17:19 +0200 |
| commit | 4be05bcfb848edc80304434a39573b9ce51d5d06 (patch) | |
| tree | 466fb26794413398b890774206a674b2ae4b8219 /tests/auto/qhelpprojectdata | |
| parent | e82f76b3874a21b9cdfe37197db448036bad7e15 (diff) | |
Don't build empty tests.
If the help tools aren't part of the Qt build, avoid building the
associated tests instead of building them as empty tests.
Change-Id: I40a74b464f46dfe0835a55321e1f3dade4e5c9f3
Reviewed-on: http://codereview.qt-project.org/6499
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/qhelpprojectdata')
| -rw-r--r-- | tests/auto/qhelpprojectdata/qhelpprojectdata.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro index 72a91bebd..8630dc92b 100644 --- a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro +++ b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro @@ -7,5 +7,4 @@ QT += testlib 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.cpp b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp index 399df70e4..cb9e880b7 100644 --- a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp +++ b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp @@ -40,8 +40,6 @@ ****************************************************************************/ #include <QtTest/QtTest> -#ifndef QT_NO_BUILD_TOOLS - #include <QtCore/QFileInfo> #include <QtHelp/private/qhelpprojectdata_p.h> @@ -187,7 +185,3 @@ void tst_QHelpProjectData::rootPath() QTEST_MAIN(tst_QHelpProjectData) #include "tst_qhelpprojectdata.moc" - -#else // QT_NO_BUILD_TOOLS -QTEST_NOOP_MAIN -#endif |