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>
This commit is contained in:
Kalle Juhani Lehtonen
2012-03-13 11:46:44 +10:00
committed by Qt by Nokia
parent 8e82f57c6a
commit 1f1bdbec82
11 changed files with 15 additions and 23 deletions

View File

@@ -14,4 +14,3 @@ CONFIG -= app_bundle
TEMPLATE = app
SOURCES += tst_qaudiobuffer.cpp
DEFINES += SRCDIR=\\\"$$PWD/\\\"

View File

@@ -19,4 +19,3 @@ include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockdecoder.pri)
SOURCES += tst_qaudiodecoder.cpp
DEFINES += SRCDIR=\\\"$$PWD/\\\"

View File

@@ -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

View File

@@ -57,10 +57,6 @@
#include "mockmediaplaylistsourcecontrol.h"
#include "mockreadonlyplaylistprovider.h"
#ifndef TESTDATA_DIR
#define TESTDATA_DIR "./"
#endif
QT_USE_NAMESPACE
class MockReadOnlyPlaylistObject : public QMediaObject