diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-11 09:26:50 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-11 09:26:50 +0100 |
| commit | cd7882b760ae34034b1b5b53c6e7970eb05f2bc2 (patch) | |
| tree | 15e248503495182aa2cf80da1fc4054585c97380 /examples/multimediawidgets/camera/camera.cpp | |
| parent | ed43209f42d1b420c0cf69330807df5177a583e8 (diff) | |
| parent | 4bb51fef0a5da88a75d5ba593557367b990ccab5 (diff) | |
| download | qtmultimedia-cd7882b760ae34034b1b5b53c6e7970eb05f2bc2.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I42587537cadade4b3f45df18385adb760fb24430
Diffstat (limited to 'examples/multimediawidgets/camera/camera.cpp')
| -rw-r--r-- | examples/multimediawidgets/camera/camera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp index adb54ef55..abbbf8333 100644 --- a/examples/multimediawidgets/camera/camera.cpp +++ b/examples/multimediawidgets/camera/camera.cpp @@ -140,8 +140,8 @@ void Camera::setCamera(const QByteArray &cameraDevice) connect(imageCapture, SIGNAL(error(int,QCameraImageCapture::Error,QString)), this, SLOT(displayCaptureError(int,QCameraImageCapture::Error,QString))); - connect(camera, SIGNAL(lockStatusChanged(QCamera::LockStatus, QCamera::LockChangeReason)), - this, SLOT(updateLockStatus(QCamera::LockStatus, QCamera::LockChangeReason))); + connect(camera, SIGNAL(lockStatusChanged(QCamera::LockStatus,QCamera::LockChangeReason)), + this, SLOT(updateLockStatus(QCamera::LockStatus,QCamera::LockChangeReason))); ui->captureWidget->setTabEnabled(0, (camera->isCaptureModeSupported(QCamera::CaptureStillImage))); ui->captureWidget->setTabEnabled(1, (camera->isCaptureModeSupported(QCamera::CaptureVideo))); |