Commit Graph

5 Commits

Author SHA1 Message Date
Michael Goddard
123ffbd783 Clean up the autotest pro files to remove warnings about private headers
Since the tests are bound to a version it's unnecessary.

Change-Id: I7884615179157caa3836face22a4aa431ee5c425
Reviewed-on: http://codereview.qt.nokia.com/4155
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-09-05 03:27:42 +02:00
Michael Goddard
3bf236cc23 Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakit
Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b
2011-08-30 15:34:30 +10:00
Dmytro Poplavskiy
47a5dd4371 Fixed crash when QCameraImageCapture is deleted before QMediaRecorder.
Change-Id: I3bbb87f03f122378e9367e1f2c0cc5b61fce6ed7
Reviewed-on: http://codereview.qt.nokia.com/3550
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-08-26 06:18:30 +02:00
Michael Goddard
0344fd84c2 Try to move widget/gvitem code into new QtMultimediaKitWidgets lib.
Change-Id: I522b3e6d4465c6c5cce2483676e09320176837d6
Reviewed-on: http://codereview.qt.nokia.com/2665
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-08-25 04:47:33 +02:00
Michael Goddard
a6128410da 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>
2011-07-26 06:45:46 +02:00