diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-17 18:51:44 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-19 07:23:44 +0200 |
| commit | ae1810658b75dd0eb0247b0e951ce315c8ce4c86 (patch) | |
| tree | cbc133fa2b3ba0e476aa375974e71f58d494a2a1 /tests/auto/corelib | |
| parent | 757b0529c42690988f565ca03194900c4d1289f8 (diff) | |
Move QTRY_VERIFY/QTRY_COMPARE into testlib.
These functions have lived in tests/shared/util.h for a long time, but
they really belong in qtestlib.
Change-Id: I60d569d002dea220b51563931d8b7aa77a20b98b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib')
6 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp index e5feab4aa6..519eab08c0 100644 --- a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp +++ b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp @@ -40,12 +40,9 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include "../../../../shared/util.h" - #include <QtCore/qpropertyanimation.h> #include <QtCore/qvariantanimation.h> #include <QtWidgets/qwidget.h> -#include "../../../../shared/util.h" //TESTED_CLASS=QPropertyAnimation //TESTED_FILES= diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp index 00c038b948..42438a6827 100644 --- a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp +++ b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp @@ -40,8 +40,6 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include "../../../../shared/util.h" - #include <QtCore/qanimationgroup.h> #include <QtCore/qsequentialanimationgroup.h> diff --git a/tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp b/tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp index 615a4c507f..c7e35e2b75 100644 --- a/tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp +++ b/tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp @@ -46,7 +46,6 @@ #include <qfuturewatcher.h> #include <qtconcurrentrun.h> #include <qtconcurrentmap.h> -#include "../../../../shared/util.h" #include <private/qfutureinterface_p.h> using namespace QtConcurrent; diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index 571f633c4b..5d3e268d96 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -51,7 +51,6 @@ #include <QtCore/QtDebug> #include <QtCore/QString> #include <QtGui/QKeySequence> -#include "../../../../shared/util.h" #include <cctype> #if defined(Q_OS_WIN) && defined(Q_CC_GNU) diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp index 2e1f914497..83c67d695c 100644 --- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp @@ -54,8 +54,6 @@ #include <QTcpServer> #include <QTcpSocket> -#include "../../../../shared/util.h" - //TESTED_CLASS= //TESTED_FILES= diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp index d069cf162e..4af2a492d7 100644 --- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp +++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp @@ -50,9 +50,6 @@ #include <unistd.h> #endif -#include "../../../../shared/util.h" - - //TESTED_CLASS= //TESTED_FILES= |