feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BlackBerry: Fix compile with Qt4

Browse Source 
Change-Id: Ib3ccf13badf710afc95cccbbab6d6b01d9a00e6a
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Christian Stenger
2014-01-27 11:42:43 +01:00
committed by Christian Kandeler
parent d1e11de701
commit ae95a7b368
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qnx/blackberrydebugtokenpinsdialog.h
View File

@@ -36,6 +36,7 @@
QT_BEGIN_NAMESPACE
class QStandardItemModel;
class QModelIndex;
QT_END_NAMESPACE
namespace Qnx {

2
src/plugins/qnx/blackberrydebugtokenreader.cpp
View File

@@ -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()

2
src/plugins/qnx/blackberrykeyswidget.cpp
View File

@@ -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)

1
src/plugins/qnx/blackberrykeyswidget.h
View File

@@ -39,6 +39,7 @@
QT_BEGIN_NAMESPACE
class QStandardItemModel;
class QModelIndex;
QT_END_NAMESPACE
namespace Qnx {