Commit Graph

2026 Commits

Author SHA1 Message Date
Dmytro Poplavskiy
7941413f3f Gst player backend: don't show the first frame when resuming playback.
It's necessary to temporarily disable show-preroll-frame of video sink,
load pipeline to paused state, seek to requested position,
and after seeking is finished (position updated) playback is started
with show-preroll-frame restored.

Task-number: MOBILITY-3030
Reviewed-by: Jonas Rabbe
Change-Id: Ide1e6d909dd53f670229c293bc6be496a54e8626
(cherry picked from commit 625cce87e28fc7b5ec8785824affb3129fd3607b)
Reviewed-on: http://codereview.qt-project.org/5500
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-09-27 01:06:04 +02:00
hawcroft
a328dab2e3 Needs widgets module to build.
Change-Id: I95ba0c64843bfcdfc9797c4d818ac17606e4a1d3
Reviewed-on: http://codereview.qt-project.org/5563
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
2011-09-27 01:05:10 +02:00
Michael Goddard
a24b8d3a61 Fix a few QT_BEGIN/END_HEADER pairs.
Change-Id: Ie723af34680222b939aeb0179df21d63cec3cf3b
Reviewed-on: http://codereview.qt-project.org/5514
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-09-27 00:05:52 +02:00
Michael Goddard
136adad652 Remove QApplication usage - it's in QCoreApplication.
Change-Id: I0c1fab0c0eea56f1ecb141d6238acdf2778c82d8
Reviewed-on: http://codereview.qt-project.org/5513
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
2011-09-26 08:55:41 +02:00
Michael Goddard
26d8bedc39 Move the backend specific documentation into a nicer place.
We really don't need to bore the 99.9% of people who won't care.  And
it's certainly not more important than camera.

Reviewed-by: Derick Hawcroft
(cherry picked from commit 51e3a1bc45ffc2688fcd3949216aedda4c41bf81)

Change-Id: I8add47e42c2c06bf5e16f406604a19531af6901e
Reviewed-on: http://codereview.qt-project.org/5501
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-26 07:23:35 +02:00
Ling Hu
589b2e3adf Fix a playback bug for mediaplayer windows media foundation backend
Task-number:QTMOBILITY-1606

Reviewed-by:Jonas Rabbe
(cherry picked from commit d5426bf52e19c9c6a52837b423f48024979ea076)

Change-Id: Ie7c1c90a8f5a64e77c435ffc1917d8f9638dfff3
Reviewed-on: http://codereview.qt-project.org/5499
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-26 07:22:52 +02:00
Gareth Stockwell
9cb61ab778 Fixed directshow config test
In some versions of Microsoft Windows SDK v6.0A, the qedit.h header is
present, but dxtrans.h (which is #included by qedit.h) is missing.

The standard workaround for this issue is already used by
plugins/multimedia/directshow/camera/dscamerasession.h; this commit adds
the same workaround to the config test.

Reviewed-by: Michael Goddard
Reviewed-by: Ling Hu
(cherry picked from commit e3c07dc9dd6a9f7930ca3c61cfd667d816731ce1)

Change-Id: Ia53c4f6b3efc86e2447a39e6d95e7f67d7e46b5d
Reviewed-on: http://codereview.qt-project.org/5498
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-26 07:21:50 +02:00
Gareth Stockwell
8c29d67e67 Fixed a typo in the WMF backend which caused a compilation failure
Reviewed-by: trustme
(cherry picked from commit 7eab979c41513321518d5e3cea6d142bbf4e58d9)

Change-Id: I9cd5de907867ea6561c568d10c88e3bf5a701509
Reviewed-on: http://codereview.qt-project.org/5496
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-26 07:21:35 +02:00
Ling Hu
ea4c32602d fix a spelling error
Change-Id: Ic593f342055a4ff65503bd92236ff2904012d4f4
Reviewed-by:Michael Goddard
(cherry picked from commit d9cd5386f6d9aa1c702424d272d70a0b45a6b9db)
Reviewed-on: http://codereview.qt-project.org/5495
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-26 07:21:12 +02:00
Ling Hu
5449f1fd9c Fix config.tests for directshow backend.
directshow camera backend requires header qedit.h(currently removed since Windows SDK v7.0),
so if there is only Windows SDK v7.0, directshow backend should be disabled, since the directshow
mediaplayer will also be replaced by wmf backend.

Change-Id: I0de60fdcb683a57cc0aa3570f769179afc0c581b
Reviewed-by:Michael Goddard
(cherry picked from commit 68d78008f9d1eb82de673b8f4c8e73bdde2150c2)
Reviewed-on: http://codereview.qt-project.org/5494
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-26 07:21:01 +02:00
Ling Hu
c94742dd9d Fix the config.tests for WMF backend.
Windows SDK v7.0 is required to compile the WMF backend,
so add additional check for MENonFatalError.

Change-Id: I3edb86b8132b8022b30c02ea6289f617aadfc683
Reviewed-by: Michael Goddard
(cherry picked from commit b738126352e5d914ea366b2725b72e2306b39ee2)
Reviewed-on: http://codereview.qt-project.org/5493
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-26 07:20:46 +02:00
Michael Goddard
be98375f90 Merge branch 'camera' of ssh://codereview.qt-project.org:29418/qt/qtmultimediakit
Conflicts:
	src/imports/multimedia/multimedia.cpp
	src/imports/multimedia/multimedia.pro

Change-Id: I9d4bc1aa65f89ac24dd12c1e2c21a02f49913e13
2011-09-26 14:17:32 +10:00
Michael Goddard
247dcc770b Move resource policy usage to a config test.
MeeGo uses this too.

Change-Id: I0b7ec00538289d4a3beea62da08233c0d1eb45a2
Reviewed-on: http://codereview.qt-project.org/5447
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-09-26 02:16:25 +02:00
Michael Goddard
91ae6f5e94 Clean some doc warnings.
Change-Id: I9cadc589a02bbc4804d2d21ab30752af375ef89c
Reviewed-on: http://codereview.qt-project.org/5348
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2011-09-22 08:10:49 +02:00
Michael Goddard
8b5c31c5c6 Add QT_BEGIN/END_HEADER things, plus QT_MODULE thing.
Change-Id: I1a5f51a659175cadadcdaf0c4e5e9048f98e64e0
Reviewed-on: http://codereview.qt-project.org/5346
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-22 07:08:21 +02:00
Gunnar Sletta
4806115e61 Fix widget dependencies for multimediawidget tests and examples.
Change-Id: I9c7600ce2cf7980f923ba038ef122b49add24c37
Reviewed-on: http://codereview.qt-project.org/5286
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-22 04:36:10 +02:00
Michael Goddard
db79e08675 Remove older QGLContext calls in favour of new QOpenGLContext.
Change-Id: I2669f48ebac5c14f5aaf85135f3d0adbf541d877
Reviewed-on: http://codereview.qt-project.org/5339
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-09-22 04:36:07 +02:00
Ling Hu
9a3237d533 Don't re-set default properties in MediaBase::componentComplete
This is to avoid conflicting with state restore from background playback.

Change-Id: Idc5440b55a27bb5c5109717f405591e934bbedbc
Reviewed-on: http://codereview.qt-project.org/4397
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2011-09-20 16:50:12 +02:00
Gunnar Sletta
61c8412577 add QT+=widgets for tests to run
Change-Id: Idccbb5429f1f081d815b4596f0cf0f74c1160f5c
Reviewed-on: http://codereview.qt-project.org/5188
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-09-20 07:34:19 +02:00
dakovaci
cf8ef332ba Added basic radio system tests
Change-Id: I6f3ef3e3c9f1bb851c2d9f9cbad1aea1df77004f
Reviewed-on: http://codereview.qt-project.org/4945
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daron Andrew Edie
2011-09-17 12:19:46 +02:00
dakovaci
054454a775 Added basic camera system tests
Change-Id: I39cefa9207bf45d57cb735cb1a7335b9153d79ee
Reviewed-on: http://codereview.qt-project.org/4944
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daron Andrew Edie
2011-09-17 12:19:40 +02:00
dakovaci
81998435ee added basic video system tests
Change-Id: I89cadef1249296c834c4a612f5885439986ff1dc
Reviewed-on: http://codereview.qt-project.org/4943
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daron Andrew Edie
2011-09-17 12:19:32 +02:00
dakovaci
dcee83dfc0 Added basic audio system tests
Change-Id: Ib3cec8adc4cba80a9e91d6fd90c607e99a197c0c
Reviewed-on: http://codereview.qt-project.org/4942
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
Reviewed-by: Daron Andrew Edie
2011-09-17 12:19:25 +02:00
Dmytro Poplavskiy
aef6b5a38a Camerabin backend: fixed compilation without X11
Disable video widget and overlay controls on systems without X11

Change-Id: I0163fa83018b35ba6f0f8221ad3c465506b52d00
Reviewed-on: http://codereview.qt-project.org/4850
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
2011-09-17 07:32:37 +02:00
Gunnar Sletta
eedcc340f1 Compile with refactor
Change-Id: I248f811a13ca00ccbf5d342a556d389bca625856
Reviewed-on: http://codereview.qt-project.org/4940
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-17 03:24:15 +02:00
Lasse Holmstedt
4840be0239 Build fix after refactor
Change-Id: I2de40846fc7402ddf32259d42a486a74330ff626
2011-09-13 13:28:28 +02:00
Dmytro Poplavskiy
1913f164dc QML Camera element redesign.
Grouped camera properties in a similar way to C++ QCamera API.
Added support for video recording.

Change-Id: I8667dc90878b3e20eda5523ba562f5687bd0932b
Reviewed-on: http://codereview.qt-project.org/3552
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
2011-09-12 03:27:29 +02:00
Michael Goddard
d690596868 Split some of the autotests into widget and non widget parts.
Since the tests are mostly not widget based.

Change-Id: Ic3fa4224b19f2a5c710fd4763b5e645252975c1c
Reviewed-on: http://codereview.qt-project.org/4174
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2011-09-09 02:09:54 +02:00
Michael Goddard
461a37b412 Silly defs file error.
Change-Id: Ic4c128b6c410701092848048982a8e82a5c58b88
Reviewed-on: http://codereview.qt.nokia.com/4224
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-06 04:17:31 +02:00
Michael Goddard
7507c80524 Fix some compiler warnings.
Mostly about deprecated ASCII casts.

Change-Id: I70428913799c15f20a1a5f80be57848e1072e058
Reviewed-on: http://codereview.qt.nokia.com/4158
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-09-05 04:53:14 +02:00
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
Ling Hu
40c100ca3e Add background audio element.
Change-Id: I64c91beb7219cc148efc606e87e5f6e57b4b55ce
Reviewed-on: http://codereview.qt.nokia.com/3574
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-02 06:39:29 +02:00
Michael Goddard
955c3f21b8 Mark a few tests as insignificant on QPA.
Running with QPA minimal isn't enough for a lot of the video related
tests, and in some cases the backing store code crashes.

Change-Id: I7a09c244fb856397a60c53388b22c3e141737a66
Reviewed-on: http://codereview.qt.nokia.com/4106
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-09-02 05:24:50 +02:00
Ling Hu
312f8c8817 Add QMediaBackgroundPlaybackControl interface
Allows some media service backend to provide the ability to can play media in the background while the application is terminated.

Change-Id: Ia5e751367f6d6ea6847c3c873b45df5f971557e2
Reviewed-on: http://codereview.qt.nokia.com/3561
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-02 04:01:34 +02:00
Jonas Rabbe
a6e2cbb83c Added tune up and down methods, and changed name of scan methods.
Instead of requiring developers using the radio API to read the
frequency step, adding it to the current frequency and setting the
new frequency, there has been added tuneUp and tuneDown methods.
Also, the searchBackward and searchForward methods have been renamed
to scanDown and scanUp which seem more logical. And cancelSearch
has become cancelScan.

Change-Id: Ib9ff61c0f58163039f41f045037cb9a11b37a59e
Reviewed-on: http://codereview.qt.nokia.com/4013
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
2011-09-01 02:42:57 +02:00
Jonas Rabbe
6781063df6 Merge branch 'radio' into 'master'
Change-Id: I86243b496b9fb42f828a67343dc576baa2c21ca0
2011-08-31 13:09:47 +10:00
Jonas Rabbe
8e954ee246 Added QML API for getting the limits for a specific radio band.
Using properties for the frequency step, minimum and maximum
frequency of the currently selected band.
Also updated the declarative-radio example to use the minimum
and maximum frequencies to show a tuner band for the radio.

Change-Id: I9f28f10e98e008c14b10bdc12b0727086cd45f0b
Reviewed-on: http://codereview.qt.nokia.com/3829
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2011-08-30 07:40:43 +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
Dmytro Poplavskiy
ba62df130c Fixed crash when QMediaObject is deleted before QMediaRecorder.
Change-Id: I8a1674b6f3d2b2c9ab888facff21f94af41b81de
Reviewed-on: http://codereview.qt.nokia.com/3544
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-08-26 06:18:10 +02:00
Jonas Rabbe
7535629ecb Introduction of fake radio backend to enable testing the radio APIs
Includes some behavior for all standard methods.
Also fixes a typo in qradiotunercontrol.h and a couple of minor
bugs in the radio example that came to light using this new
backend.

Change-Id: I65b8b8715a46f0fd702f9630ea81f7d5df527055
Reviewed-on: http://codereview.qt.nokia.com/3619
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-08-26 06:10:10 +02:00
Michael Goddard
4ddffcdae3 Split the unit tests for widgets up as well.
Currently there seem to be some unit tests that should not depend
on widgets, so they'll have to be cleaned up later.

Change-Id: I30adc4accb3ecce86a6fe7a2fd69d3862f325a41
Reviewed-on: http://codereview.qt.nokia.com/3569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
2011-08-26 01:06:08 +02:00
Dmytro Poplavskiy
5d71ee6abf Dropped Incandescent white balance mode.
It's the same as Tungsten, was inittialy added by mistake.

Change-Id: Idf1d7be2f8d0969bba3480a8702034b7cabfdaef
Reviewed-on: http://codereview.qt.nokia.com/3563
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-08-25 09:18:16 +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
Dmytro Poplavskiy
da9b436cd1 Ported gstreamer camera backend from camerabin to camerabin2.
Change-Id: Ieb08df492e7b9cbfe35e93a056685cfdac6e704e
Reviewed-on: http://codereview.qt.nokia.com/2994
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-08-24 07:07:45 +02:00
Jason McDonald
e7bda0c3bf Remove obsolete testlib files from .gitignore
Change-Id: Id5efe3f7223486ec188d723b65e051671e7aa8cc
Reviewed-on: http://codereview.qt.nokia.com/3373
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-08-23 10:49:55 +02:00
Jonas Rabbe
f60838dcfd Added first implementation of declarative radio element
Simply uses and mirrors radio tuner API directly.
Also added an example which uses the new Radio element,
the example should be functional, but cannot be tested on
current setup (lack of actual radio tuner).

Change-Id: I0f724ef239f65aef9c0640d4a3a9fa0d2e7242ed
Reviewed-on: http://codereview.qt.nokia.com/2890
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-08-17 02:37:10 +02:00
Dmytro Poplavskiy
abee3a6548 Initial implementation of QML2 VideoOutput element
Change-Id: I5ed00433fe5e993086ae1698b7344c8d60a5f0f6
Reviewed-on: http://codereview.qt.nokia.com/2727
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-08-11 08:14:24 +02:00
Dmytro Poplavskiy
e70ebfd2ed Gstreamer media backend cleanup.
Moved controls specific bus/sync messages handling from
player/camera/capture session to corresponding controls.

Reviewed-by: Michael Goddard
Change-Id: Ieb67976ed335b0ef1cde87dc60e8ad8da3409526
Reviewed-on: http://codereview.qt.nokia.com/2535
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-08-05 07:50:59 +02:00
Jason McDonald
74feb5d34e Replace outdated license headers.
Change-Id: Icbdd1bdae223192465b8c84faeb99b01be154275
Reviewed-on: http://codereview.qt.nokia.com/2605
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-08-05 03:03:02 +02:00