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

BlackBerry: Fix missing error string

Browse Source 
Change-Id: I674f90eb871fdb0cbb84207a402d434aca966d1e
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
This commit is contained in:
Rafael Roquetto
2013-03-08 17:57:46 -03:00
committed by Rafael Roquetto
parent 17cd161a9d
commit 11fa9797ec
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
View File

@@ -237,6 +237,9 @@ void BlackBerryDebugTokenRequestDialog::debugTokenArrived(int status)
case BlackBerryDebugTokenRequester::InferiorProcessWriteError: case BlackBerryDebugTokenRequester::InferiorProcessWriteError:
errorString += tr("Failed to communicate with the inferior process."); errorString += tr("Failed to communicate with the inferior process.");
break; break;
case BlackBerryDebugTokenRequester::NotYetRegistered:
errorString += tr("Not yet registered to request debug tokens.");
break;
case BlackBerryDebugTokenRequester::UnknownError: case BlackBerryDebugTokenRequester::UnknownError:
errorString += tr("An unknwon error has occurred."); errorString += tr("An unknwon error has occurred.");
break; break;

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

@@ -50,7 +50,7 @@ BlackBerryDebugTokenRequester::BlackBerryDebugTokenRequester(QObject *parent) :
addErrorStringMapping(QLatin1String(ERR_WRONG_KEYSTORE_PASS), WrongKeystorePassword); addErrorStringMapping(QLatin1String(ERR_WRONG_KEYSTORE_PASS), WrongKeystorePassword);
addErrorStringMapping(QLatin1String(ERR_WRONG_KEYSTORE_PASS), WrongKeystorePassword); addErrorStringMapping(QLatin1String(ERR_WRONG_KEYSTORE_PASS), WrongKeystorePassword);
addErrorStringMapping(QLatin1String(ERR_NETWORK_UNREACHABLE), NetworkUnreachable); addErrorStringMapping(QLatin1String(ERR_NETWORK_UNREACHABLE), NetworkUnreachable);
addErrorStringMapping(QLatin1String(ERR_NOT_YET_REGISTGERED), BlackBerryNdkProcess::UnknownError); addErrorStringMapping(QLatin1String(ERR_NOT_YET_REGISTGERED), NotYetRegistered);
} }
void BlackBerryDebugTokenRequester::requestDebugToken(const QString &path, void BlackBerryDebugTokenRequester::requestDebugToken(const QString &path,

3
src/plugins/qnx/blackberrydebugtokenrequester.h
View File

@@ -47,7 +47,8 @@ public:
WrongCskPassword = UserStatus, WrongCskPassword = UserStatus,
WrongKeystorePassword, WrongKeystorePassword,
NetworkUnreachable, NetworkUnreachable,
IllegalPin IllegalPin,
NotYetRegistered
}; };
explicit BlackBerryDebugTokenRequester(QObject *parent = 0); explicit BlackBerryDebugTokenRequester(QObject *parent = 0);