From 3d848f05ad88e0207d372a6d98a658c5d6e57212 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 15 Apr 2013 09:40:37 +0200 Subject: Fix tr()-Context in BlackBerry-plugin. Do not use QObject::tr(). Change-Id: I0444a0abb319d3ae7044c269d8f280ebf63128e3 Reviewed-by: Andy Nichols --- src/plugins/blackberry/camera/bbcamerasession.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/blackberry/camera/bbcamerasession.cpp b/src/plugins/blackberry/camera/bbcamerasession.cpp index d2eb62278..24e0a3796 100644 --- a/src/plugins/blackberry/camera/bbcamerasession.cpp +++ b/src/plugins/blackberry/camera/bbcamerasession.cpp @@ -335,7 +335,7 @@ static void imageCaptureImageCallback(camera_handle_t handle, camera_buffer_t *b QMetaObject::invokeMethod(data->session, "imageCaptureError", Qt::QueuedConnection, Q_ARG(int, data->requestId), 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; } @@ -344,7 +344,7 @@ static void imageCaptureImageCallback(camera_handle_t handle, camera_buffer_t *b QImage image; const bool ok = image.loadFromData(rawData, "JPG"); 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 QMetaObject::invokeMethod(data->session, "imageCaptureError", Qt::QueuedConnection, Q_ARG(int, data->requestId), -- cgit v1.2.3