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

Qnx: Use correct mkspec in the qmake step

Browse Source 
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: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
This commit is contained in:
El Mehdi Fekari
2014-03-10 11:59:14 +01:00
committed by Mehdi Fekari
parent 9d97880037
commit 71510a8d41
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qnx/blackberryapilevelconfiguration.cpp
View File

@@ -337,9 +337,15 @@ Kit *BlackBerryApiLevelConfiguration::createKit(
if (debuggerItemId.isValid()) if (debuggerItemId.isValid())
DebuggerKitInformation::setDebugger(kit, debuggerItemId); DebuggerKitInformation::setDebugger(kit, debuggerItemId);
if (isSimulator) if (version->qtVersion().majorVersion == 4) {
if (isSimulator) {
QmakeProjectManager::QmakeKitInformation::setMkspec( QmakeProjectManager::QmakeKitInformation::setMkspec(
kit, FileName::fromLatin1("blackberry-x86-qcc")); kit, FileName::fromLatin1("blackberry-x86-qcc"));
} else {
QmakeProjectManager::QmakeKitInformation::setMkspec(
kit, FileName::fromLatin1("blackberry-armv7le-qcc"));
}
}
DeviceTypeKitInformation::setDeviceTypeId(kit, Constants::QNX_BB_OS_TYPE); DeviceTypeKitInformation::setDeviceTypeId(kit, Constants::QNX_BB_OS_TYPE);
SysRootKitInformation::setSysRoot(kit, m_sysRoot); SysRootKitInformation::setSysRoot(kit, m_sysRoot);

1
src/plugins/qnx/qnxtoolchain.cpp
View File

@@ -108,6 +108,7 @@ QList<Utils::FileName> QnxToolChain::suggestedMkspecList() const
mkspecList << Utils::FileName::fromLatin1("qnx-armv7le-qcc"); mkspecList << Utils::FileName::fromLatin1("qnx-armv7le-qcc");
mkspecList << Utils::FileName::fromLatin1("qnx-x86-qcc"); mkspecList << Utils::FileName::fromLatin1("qnx-x86-qcc");
mkspecList << Utils::FileName::fromLatin1("blackberry-armv7le-qcc"); mkspecList << Utils::FileName::fromLatin1("blackberry-armv7le-qcc");
mkspecList << Utils::FileName::fromLatin1("blackberry-armle-v7-qcc");
mkspecList << Utils::FileName::fromLatin1("blackberry-x86-qcc"); mkspecList << Utils::FileName::fromLatin1("blackberry-x86-qcc");
return mkspecList; return mkspecList;