diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-11 17:40:43 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-17 03:30:55 +0200 |
| commit | 55f15606055852d511bebe0d5b59a0ae9d9d4fc1 (patch) | |
| tree | c26c131c480aa48c6bd2eb31435d14af9f81a135 /tests | |
| parent | 9e31f88d7a5038070a1f2956d4d6fd043c62df36 (diff) | |
Remove redundant logic from tools autotests.
The tools tests are not built for cross-compiled Qt builds, so the logic
to make those tests empty when cross-compiled is redundant.
Change-Id: Ia3a3a680d7ade2cee78aa633b41c9ef5be6f2f15
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/tools/qmake/tst_qmake.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/tools/uic/tst_uic.cpp | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/tests/auto/tools/qmake/tst_qmake.cpp b/tests/auto/tools/qmake/tst_qmake.cpp index 2775b5380b..8de822b47a 100644 --- a/tests/auto/tools/qmake/tst_qmake.cpp +++ b/tests/auto/tools/qmake/tst_qmake.cpp @@ -41,8 +41,6 @@ #include <QtTest/QtTest> -#if !defined(QMAKE_CROSS_COMPILED) - #include "testcompiler.h" #include <QObject> @@ -512,7 +510,3 @@ void tst_qmake::substitutes() QTEST_MAIN(tst_qmake) #include "tst_qmake.moc" - -#else // QMAKE_CROSS_COMPILED -QTEST_NOOP_MAIN -#endif diff --git a/tests/auto/tools/uic/tst_uic.cpp b/tests/auto/tools/uic/tst_uic.cpp index 754fa6e01b..45581e4400 100644 --- a/tests/auto/tools/uic/tst_uic.cpp +++ b/tests/auto/tools/uic/tst_uic.cpp @@ -47,8 +47,6 @@ #include <QtCore/QByteArray> #include <QtCore/QLibraryInfo> -#ifndef Q_OS_WINCE - class tst_uic : public QObject { Q_OBJECT @@ -221,6 +219,3 @@ QString tst_uic::workingDir() const QTEST_APPLESS_MAIN(tst_uic) #include "tst_uic.moc" -#else -QTEST_NOOP_MAIN -#endif |