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>bb10
parent
9e31f88d7a
commit
55f1560605
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue