Fix tr()-Context in BlackBerry-plugin.
authorFriedemann Kleint <Friedemann.Kleint@digia.com>
Mon, 15 Apr 2013 07:40:37 +0000 (09:40 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 15 Apr 2013 09:53:43 +0000 (11:53 +0200)
Do not use QObject::tr().

Change-Id: I0444a0abb319d3ae7044c269d8f280ebf63128e3
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
src/plugins/blackberry/camera/bbcamerasession.cpp

index d2eb622..24e0a37 100644 (file)
@@ -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),