diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-12 15:44:20 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-14 01:42:47 +0200 |
| commit | 5f7c22001163eb4bce25be1cfee4e84c5a25ff09 (patch) | |
| tree | 63fa7f5c8c7ee8432992ad4d60dda271a69f87c6 /tests/auto/qtquick1/qdeclarativexmllistmodel | |
| parent | 2696c43633c79b83979579df22efe4235f630d86 (diff) | |
Don't build empty tests.
These tests need the xmlpatterns module. If that module is not in the
Qt build, then avoid building the test rather than building an empty
test.
Change-Id: Id0f72cfc9f818096361ecbc439196d2d5c64322e
Reviewed-on: http://codereview.qt-project.org/6487
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/qtquick1/qdeclarativexmllistmodel')
| -rw-r--r-- | tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro | 6 | ||||
| -rw-r--r-- | tests/auto/qtquick1/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp | 5 |
2 files changed, 1 insertions, 10 deletions
diff --git a/tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro index ea9f75bd22..fc74409802 100644 --- a/tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro +++ b/tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro @@ -1,9 +1,5 @@ CONFIG += testcase TARGET = tst_qdeclarativexmllistmodel -contains(QT_CONFIG,xmlpatterns) { - QT += xmlpatterns - DEFINES += QTEST_XMLPATTERNS -} macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativexmllistmodel.cpp @@ -12,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private network testlib +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private network testlib xmlpatterns diff --git a/tests/auto/qtquick1/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/qtquick1/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp index 6a919a132e..021d389612 100644 --- a/tests/auto/qtquick1/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp +++ b/tests/auto/qtquick1/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp @@ -53,7 +53,6 @@ #include <QtCore/qfile.h> #include <QtCore/qtemporaryfile.h> -#ifdef QTEST_XMLPATTERNS #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> #include <QtQuick1/private/qdeclarativexmllistmodel_p.h> @@ -954,7 +953,3 @@ void tst_qdeclarativexmllistmodel::roleCrash() QTEST_MAIN(tst_qdeclarativexmllistmodel) #include "tst_qdeclarativexmllistmodel.moc" - -#else -QTEST_NOOP_MAIN -#endif |