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

Debugger: Export Debugger::DebuggerItem to fix BlackBerry setup

Browse Source 
Task-number: QTCREATORBUG-10189
Change-Id: Icddd09a1a931371133a1d03ca8cf600e76295eac
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2013-09-25 11:38:26 +02:00
parent 938b67afdf
commit 394045b218
6 changed files with 309 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qnx/blackberryconfiguration.cpp
View File

@@ -263,17 +263,27 @@ Kit *BlackBerryConfiguration::createKit(QnxArchitecture arch, BaseQtVersion *qtV
Kit *kit = new Kit;
QtKitInformation::setQtVersion(kit, qtVersion);
ToolChainKitInformation::setToolChain(kit, tc);
QString versionName = QString::fromLatin1("%1 - %2").arg(qtVersion->qtVersionString(), m_targetName);
Debugger::DebuggerItem debugger;
debugger.setCommand(arch == X86 ? m_simulatorDebuger : m_deviceDebuger);
debugger.setEngineType(Debugger::GdbEngineType);
debugger.setDisplayName(arch == X86
? tr("BlackBerry Debugger (%1) - Simulator").arg(versionName)
: tr("BlackBerry Debugger (%1) - Device").arg(versionName));
debugger.setAutoDetected(true);
debugger.setAbi(tc->targetAbi());
Debugger::DebuggerKitInformation::setDebugger(kit, debugger);
if (arch == X86) {
Debugger::DebuggerKitInformation::setDebugger(kit, Debugger::GdbEngineType, m_simulatorDebuger);
Qt4ProjectManager::QmakeKitInformation::setMkspec(kit, FileName::fromString(QString::fromLatin1("blackberry-x86-qcc")));
// TODO: Check if the name already exists(?)
kit->setDisplayName(tr("BlackBerry 10 (%1 - %2) - Simulator").arg(qtVersion->qtVersionString(), m_targetName));
kit->setDisplayName(tr("BlackBerry 10 (%1) - Simulator").arg(versionName));
} else {
Debugger::DebuggerKitInformation::setDebugger(kit, Debugger::GdbEngineType, m_deviceDebuger);
kit->setDisplayName(tr("BlackBerry 10 (%1 - %2)").arg(qtVersion->qtVersionString(), m_targetName));
kit->setDisplayName(tr("BlackBerry 10 (%1)").arg(versionName));
}
kit->setAutoDetected(m_isAutoDetected);
kit->setIconPath(FileName::fromString(QLatin1String(Constants::QNX_BB_CATEGORY_ICON)));
kit->setMutable(DeviceKitInformation::id(), true);