summaryrefslogtreecommitdiffstats
path: root/tests/auto/unit/qcameraviewfinder
diff options
context:
space:
mode:
authorDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2012-01-19 10:01:02 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-24 09:11:07 +0100
commita78a95ccd4c876bca7fe748c44c9744e828d375e (patch)
tree4a72285e10aab435682fb7cdbbc4e70432191b20 /tests/auto/unit/qcameraviewfinder
parentadb2bd2cd4bb2b01b15f6213681654949f2c797c (diff)
Removed QMediaServiceProvider parameter from media objects constructors.
QMediaServiceProvider should be removed from the public API, to provide media objects with a custom media service. A protected QMediaPlayer/QCamera/QRadioTuner/etc constructor with QMediaService* parameter is a cleaner and more flexible solution. Change-Id: I335cce4bbebe0e548c3df338f206e7be7c93c3dd Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'tests/auto/unit/qcameraviewfinder')
-rw-r--r--tests/auto/unit/qcameraviewfinder/tst_qcameraviewfinder.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/unit/qcameraviewfinder/tst_qcameraviewfinder.cpp b/tests/auto/unit/qcameraviewfinder/tst_qcameraviewfinder.cpp
index 7b73b0a30..2d376abf6 100644
--- a/tests/auto/unit/qcameraviewfinder/tst_qcameraviewfinder.cpp
+++ b/tests/auto/unit/qcameraviewfinder/tst_qcameraviewfinder.cpp
@@ -74,8 +74,9 @@ void tst_QCameraViewFinder::initTestCase()
provider = new MockMediaServiceProvider;
mockcameraservice = new MockCameraService;
provider->service = mockcameraservice;
+ QMediaServiceProvider::setDefaultServiceProvider(provider);
- camera = new QCamera(0, provider);
+ camera = new QCamera;
viewFinder = new QCameraViewfinder();
}