diff options
author | Sergio Ahumada <sahumada@blackberry.com> | 2015-02-11 10:05:21 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-02-11 09:37:28 +0000 |
commit | 4ce9d89d7a315100393aeae9998a8f9e838650ca (patch) | |
tree | 7679777220b6ea0ce313d065794001dffed3b9de /src/multimedia | |
parent | 13b24ab18b13c788f7cd5788303d2a226353e70d (diff) |
Fix some typos
Change-Id: Iaf8f50741d3103480668b4a654a202d8a363bc45
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/multimedia')
-rw-r--r-- | src/multimedia/camera/qcameraimagecapture.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/controls/qcameraimagecapturecontrol.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/doc/src/blackberry.qdoc | 2 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/video/qvideoprobe.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp index 341317649..8979637af 100644 --- a/src/multimedia/camera/qcameraimagecapture.cpp +++ b/src/multimedia/camera/qcameraimagecapture.cpp @@ -520,7 +520,7 @@ bool QCameraImageCapture::isReadyForCapture() const the default directory, with a full path reported with imageCaptured() and imageSaved() signals. QCamera saves all the capture parameters like exposure settings or - image processing parameters, so changes to camera paramaters after + image processing parameters, so changes to camera parameters after capture() is called do not affect previous capture requests. QCameraImageCapture::capture returns the capture Id parameter, used with diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.cpp b/src/multimedia/controls/qcameraimagecapturecontrol.cpp index b05c42353..ebeb7c5b3 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp +++ b/src/multimedia/controls/qcameraimagecapturecontrol.cpp @@ -111,7 +111,7 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl() The Camera service should save all the capture parameters like exposure settings or image processing parameters, - so changes to camera paramaters after capture() is called + so changes to camera parameters after capture() is called do not affect previous capture requests. Returns the capture request id number, which is used later diff --git a/src/multimedia/doc/src/blackberry.qdoc b/src/multimedia/doc/src/blackberry.qdoc index 48616a270..3eab2850f 100644 --- a/src/multimedia/doc/src/blackberry.qdoc +++ b/src/multimedia/doc/src/blackberry.qdoc @@ -31,7 +31,7 @@ \brief Platform notes for the BlackBerry Platform Qt Multimedia supports BlackBerry devices that run the BB10 operating system. -This page covers the availibility of different features on BB10. +This page covers the availability of different features on BB10. \section1 Implementation diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 66aec7c03..8f8399d66 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -335,7 +335,7 @@ void QMediaPlayerPrivate::setPlaylistMedia() return; } else if (control != 0) { // If we've just switched to a new playlist, - // then last emited currentMediaChanged was a playlist. + // then last emitted currentMediaChanged was a playlist. // Make sure we emit currentMediaChanged if new playlist has // the same media as the previous one: // sample.m3u diff --git a/src/multimedia/video/qvideoprobe.cpp b/src/multimedia/video/qvideoprobe.cpp index 496b324f6..e789baae5 100644 --- a/src/multimedia/video/qvideoprobe.cpp +++ b/src/multimedia/video/qvideoprobe.cpp @@ -51,7 +51,7 @@ player->setVideoOutput(myVideoSurface); player->setMedia(QUrl::fromLocalFile("observation.mp4")); - player->play(); // Start receving frames as they get presented to myVideoSurface + player->play(); // Start receiving frames as they get presented to myVideoSurface \endcode This same approach works with the QCamera object as well, to receive viewfinder or video |