BlackBerry: Fix certificate marshalling on new NDKs

Newer BB NDKs use a different format for blackberry-keytool. This patch
fixes QtC to support this new format.

Change-Id: Ie80c722b0d14f1ce9132d7e1b4dc66ef8edd422e
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>

1 files changed, 11 insertions, 7 deletions

diff --git a/src/plugins/qnx/blackberryimportcertificatedialog.cpp b/src/plugins/qnx/blackberryimportcertificatedialog.cpp
index 95f9eb5d73..753b7e404d 100644
--- a/src/plugins/qnx/blackberryimportcertificatedialog.cpp
+++ b/src/plugins/qnx/blackberryimportcertificatedialog.cpp
@@ -117,13 +117,17 @@ void BlackBerryImportCertificateDialog::certificateLoaded(int status)
         m_certificate->deleteLater();
         m_certificate = 0;
 
-        if (status == BlackBerryCertificate::WrongPassword) {
-            QMessageBox::information(this, tr("Error"),
-                    tr("The keystore password is invalid."));
-        } else {
-            QMessageBox::information(this, tr("Error"),
-                    tr("An unknown error has occurred."));
-        }
+        QString message;
+
+        if (status == BlackBerryCertificate::WrongPassword)
+            message = tr("The keystore password is invalid.");
+        else if (status == BlackBerryCertificate::InvalidOutputFormat)
+            message = tr("Error parsing inferior process output.");
+        else
+            message = tr("An unknown error has occurred.");
+
+        QMessageBox::information(this, tr("Error"), message);
+
     } else {
         m_author = m_certificate->author();
         accept();