summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmediaplayer/qmediaplayer.pro
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2011-07-25 15:02:51 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-26 06:45:46 +0200
commita6128410da0fc11b2ce7d3ecb8d5f75a011897ef (patch)
tree7df32e185f68115f967d94540c6e9389c9669b66 /tests/auto/qmediaplayer/qmediaplayer.pro
parent1e4dda971098656dad390478601ee932e9c4e3e3 (diff)
API unit tests from Maemo API test team.
A large number of tweaks and changes to original tests, and refactor a lot of the mock backends to reduce duplication. Changed viewfinder test case to use mock service and provider so that it matches the image capture test case. Reviewed-by: Jonas Rabbe (cherry picked from commit e40bef5508a4165cec4a46b97115aed461027fa5) Also licence header fix: (cherry picked from commit e9ee9e8c48b45b97d62ee4a82e400fa9d8ea8107) Change-Id: Ic59891d75563bb2e008a336eea859e8c44d8d831 Reviewed-on: http://codereview.qt.nokia.com/2078 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'tests/auto/qmediaplayer/qmediaplayer.pro')
-rw-r--r--tests/auto/qmediaplayer/qmediaplayer.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qmediaplayer/qmediaplayer.pro b/tests/auto/qmediaplayer/qmediaplayer.pro
index 0c2880e0d..26bf81326 100644
--- a/tests/auto/qmediaplayer/qmediaplayer.pro
+++ b/tests/auto/qmediaplayer/qmediaplayer.pro
@@ -8,3 +8,5 @@ QT += network multimediakit-private
HEADERS += tst_qmediaplayer.h
SOURCES += main.cpp tst_qmediaplayer.cpp
+include (../qmultimedia_common/mock.pri)
+include (../qmultimedia_common/mockplayer.pri)