Commit 71510a8d authored by El Mehdi Fekari's avatar El Mehdi Fekari Committed by Mehdi Fekari
Browse files

Qnx: Use correct mkspec in the qmake step



In order to use the correct mkspec in the qmake step,
the qt version mkspec needs to be explicitly listed in the QnxToolChain
suggested mkspec list (Otherwise the first one found in
list will be used).

That is currently broken due to the following issues:

* The mkspec for BB armle-v7 target has been recently
changed to blackberry-armle-v7-qcc, which was not listed
in the QnxToolChain suggested mkspec list.

* The Qt4 for BB armle-v7 uses the "default" mkspec which is a copy
of the "blackberry-armv7le-qcc" mkspec. The mkspec
name should be explicit in order to be found and used.

Task-number: QTCREATORBUG-11674

Change-Id: Idb53d22e7c4b746b23dd3a65c42d00dca5c27d0c
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
Reviewed-by: default avatarFabian Bumberger <fbumberger@rim.com>
parent 9d978800
......@@ -337,9 +337,15 @@ Kit *BlackBerryApiLevelConfiguration::createKit(
if (debuggerItemId.isValid())
DebuggerKitInformation::setDebugger(kit, debuggerItemId);
if (isSimulator)
QmakeProjectManager::QmakeKitInformation::setMkspec(
kit, FileName::fromLatin1("blackberry-x86-qcc"));
if (version->qtVersion().majorVersion == 4) {
if (isSimulator) {
QmakeProjectManager::QmakeKitInformation::setMkspec(
kit, FileName::fromLatin1("blackberry-x86-qcc"));
} else {
QmakeProjectManager::QmakeKitInformation::setMkspec(
kit, FileName::fromLatin1("blackberry-armv7le-qcc"));
}
}
DeviceTypeKitInformation::setDeviceTypeId(kit, Constants::QNX_BB_OS_TYPE);
SysRootKitInformation::setSysRoot(kit, m_sysRoot);
......
......@@ -108,6 +108,7 @@ QList<Utils::FileName> QnxToolChain::suggestedMkspecList() const
mkspecList << Utils::FileName::fromLatin1("qnx-armv7le-qcc");
mkspecList << Utils::FileName::fromLatin1("qnx-x86-qcc");
mkspecList << Utils::FileName::fromLatin1("blackberry-armv7le-qcc");
mkspecList << Utils::FileName::fromLatin1("blackberry-armle-v7-qcc");
mkspecList << Utils::FileName::fromLatin1("blackberry-x86-qcc");
return mkspecList;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment