diff options
| author | Kalle Juhani Lehtonen <kalle.ju.lehtonen@nokia.com> | 2012-03-13 11:46:44 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-15 04:03:17 +0100 |
| commit | 1f1bdbec82b0f85fda5615945d13ff7b542caa9d (patch) | |
| tree | 2cce82c1ad43144b5f54dfb9dcfc80f8ba3bf1d4 /tests/auto/unit/qmediaplaylist | |
| parent | 8e82f57c6ac2db6754bfcd6828accb2fcfb77891 (diff) | |
Add use of TESTDATA feature to integration tests
Use TESTDATA and QFINDTESTDATA in integration tests. Also remove
unused path defines from unit test .pro files.
Change-Id: I46dc6a96b918e989acf79eb3bd23c53125c7c3d6
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'tests/auto/unit/qmediaplaylist')
| -rw-r--r-- | tests/auto/unit/qmediaplaylist/qmediaplaylist.pro | 2 | ||||
| -rw-r--r-- | tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro index ba51c6501..a6728b594 100644 --- a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro +++ b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro @@ -6,8 +6,6 @@ include (../qmultimedia_common/mockplaylist.pri) QT += multimedia-private testlib CONFIG += no_private_qt_headers_warning -DEFINES += TESTDATA_DIR=\\\"$$PWD/\\\" - HEADERS += \ $$QT.multimedia.sources/../plugins/m3u/qm3uhandler.h diff --git a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp index 018db83f3..38b7fd730 100644 --- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp +++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp @@ -57,10 +57,6 @@ #include "mockmediaplaylistsourcecontrol.h" #include "mockreadonlyplaylistprovider.h" -#ifndef TESTDATA_DIR -#define TESTDATA_DIR "./" -#endif - QT_USE_NAMESPACE class MockReadOnlyPlaylistObject : public QMediaObject |