From ae95a7b3688d6230d2c3559c67e1d7f5c3d4f11e Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@digia.com>
Date: Mon, 27 Jan 2014 11:42:43 +0100
Subject: [PATCH] BlackBerry: Fix compile with Qt4

Change-Id: Ib3ccf13badf710afc95cccbbab6d6b01d9a00e6a
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
---
 src/plugins/qnx/blackberrydebugtokenpinsdialog.h | 1 +
 src/plugins/qnx/blackberrydebugtokenreader.cpp   | 2 +-
 src/plugins/qnx/blackberrykeyswidget.cpp         | 2 +-
 src/plugins/qnx/blackberrykeyswidget.h           | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qnx/blackberrydebugtokenpinsdialog.h b/src/plugins/qnx/blackberrydebugtokenpinsdialog.h
index d36c65a7f6c..08d22f4dd3f 100644
--- a/src/plugins/qnx/blackberrydebugtokenpinsdialog.h
+++ b/src/plugins/qnx/blackberrydebugtokenpinsdialog.h
@@ -36,6 +36,7 @@
 
 QT_BEGIN_NAMESPACE
 class QStandardItemModel;
+class QModelIndex;
 QT_END_NAMESPACE
 
 namespace Qnx {
diff --git a/src/plugins/qnx/blackberrydebugtokenreader.cpp b/src/plugins/qnx/blackberrydebugtokenreader.cpp
index 3dfb45686df..7b28c837ecf 100644
--- a/src/plugins/qnx/blackberrydebugtokenreader.cpp
+++ b/src/plugins/qnx/blackberrydebugtokenreader.cpp
@@ -102,7 +102,7 @@ QString BlackBerryDebugTokenReader::pins() const
         pinsHexa << hexa.setNum(pin.toUInt(), 16);
     }
 
-    return pinsHexa.join(QLatin1Char(','));
+    return pinsHexa.join(QLatin1String(","));
 }
 
 bool BlackBerryDebugTokenReader::isSupported()
diff --git a/src/plugins/qnx/blackberrykeyswidget.cpp b/src/plugins/qnx/blackberrykeyswidget.cpp
index 3455454c909..fb38b8c011d 100644
--- a/src/plugins/qnx/blackberrykeyswidget.cpp
+++ b/src/plugins/qnx/blackberrykeyswidget.cpp
@@ -303,7 +303,7 @@ void BlackBerryKeysWidget::updateDebugToken(const QStringList &pins)
     const QString debugTokenPath = m_dtModel->item(m_ui->debugTokens->currentIndex().row(), 0)->text();
     m_requester->requestDebugToken(debugTokenPath,
                                    cskPassword, configuration.defaultKeystorePath(),
-                                   certificatePassword, pins.join(QLatin1Char(',')));
+                                   certificatePassword, pins.join(QLatin1String(",")));
 }
 
 void BlackBerryKeysWidget::requestFinished(int status)
diff --git a/src/plugins/qnx/blackberrykeyswidget.h b/src/plugins/qnx/blackberrykeyswidget.h
index 2900e5f5069..b9e3e8d0a46 100644
--- a/src/plugins/qnx/blackberrykeyswidget.h
+++ b/src/plugins/qnx/blackberrykeyswidget.h
@@ -39,6 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 class QStandardItemModel;
+class QModelIndex;
 QT_END_NAMESPACE
 
 namespace Qnx {