summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@digia.com>2015-09-04 15:51:18 +0200
committerNico Vertriest <nico.vertriest@digia.com>2015-09-07 13:47:07 +0000
commitda6d287e46c107586af07e55043abb4d2a9b2d9e (patch)
treea06794dd7cd57caff4f3fd71d2fc4cbb596c7496
parent8a5f74ddf2cf3106cf84f9d327b9782de9155e07 (diff)
Doc: minor corrections
Change-Id: Idcaac01294642e7e79f6e2b8bcfd2c9559274790 Task-number: QTBUG-43810 Reviewed-by: Martin Smith <martin.smith@digia.com>
-rw-r--r--src/multimediawidgets/qvideowidget.cpp2
-rw-r--r--src/plugins/avfoundation/camera/avfcamerasession.mm2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp
index 24184e32d..d14a70475 100644
--- a/src/multimediawidgets/qvideowidget.cpp
+++ b/src/multimediawidgets/qvideowidget.cpp
@@ -734,7 +734,7 @@ void QVideoWidget::setFullScreen(bool fullScreen)
Signals that the \a fullScreen mode of a video widget has changed.
- \sa fullScreen()
+ \sa isFullScreen()
*/
/*!
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/plugins/avfoundation/camera/avfcamerasession.mm
index 2cb3824db..83f8c0ed3 100644
--- a/src/plugins/avfoundation/camera/avfcamerasession.mm
+++ b/src/plugins/avfoundation/camera/avfcamerasession.mm
@@ -220,7 +220,7 @@ void AVFCameraSession::updateCameraDevices()
// the screen when held in portrait ==> 270 degrees clockwise angle
// - Front-facing cameras have the top side of the sensor aligned with the left side of
// the screen when held in portrait ==> 270 degrees clockwise angle
- // On Mac OS, the position will always be unspecified and the sensor orientation unknown.
+ // On OS X, the position will always be unspecified and the sensor orientation unknown.
switch (device.position) {
case AVCaptureDevicePositionBack:
info.position = QCamera::BackFace;