slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix tr()-Context in BlackBerry-plugin.

Browse Source 
Do not use QObject::tr().

Change-Id: I0444a0abb319d3ae7044c269d8f280ebf63128e3
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
This commit is contained in:
Friedemann Kleint
2013-04-15 09:40:37 +02:00
committed by The Qt Project
parent 06fe7e6ad7
commit 3d848f05ad
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/blackberry/camera/bbcamerasession.cpp
View File

@@ -335,7 +335,7 @@ static void imageCaptureImageCallback(camera_handle_t handle, camera_buffer_t *b
QMetaObject::invokeMethod(data->session, "imageCaptureError", Qt::QueuedConnection, QMetaObject::invokeMethod(data->session, "imageCaptureError", Qt::QueuedConnection,
Q_ARG(int, data->requestId), Q_ARG(int, data->requestId),
Q_ARG(QCameraImageCapture::Error, QCameraImageCapture::FormatError), Q_ARG(QCameraImageCapture::Error, QCameraImageCapture::FormatError),
Q_ARG(QString, QObject::tr("Camera provides image in unsupported format"))); Q_ARG(QString, BbCameraSession::tr("Camera provides image in unsupported format")));
return; return;
} }
@@ -344,7 +344,7 @@ static void imageCaptureImageCallback(camera_handle_t handle, camera_buffer_t *b
QImage image; QImage image;
const bool ok = image.loadFromData(rawData, "JPG"); const bool ok = image.loadFromData(rawData, "JPG");
if (!ok) { if (!ok) {
const QString errorMessage = QObject::tr("Could not load JPEG data from frame"); const QString errorMessage = BbCameraSession::tr("Could not load JPEG data from frame");
// We are inside a worker thread here, so emit error signal inside the main thread // We are inside a worker thread here, so emit error signal inside the main thread
QMetaObject::invokeMethod(data->session, "imageCaptureError", Qt::QueuedConnection, QMetaObject::invokeMethod(data->session, "imageCaptureError", Qt::QueuedConnection,
Q_ARG(int, data->requestId), Q_ARG(int, data->requestId),