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

QNX: Fix mkspec name

Browse Source 
Starting with Qt 5.3.0 the mkspec was renamed to "qnx-armle-v7-qcc".

Change-Id: I977c4666ce13cb2f1fb70497a7697b96f64780e0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
BogDan Vatra
2015-10-09 16:22:50 +03:00
committed by BogDan Vatra
parent 70d3fd8271
commit 987d6aedbf
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qnx/qnxconfiguration.cpp
View File

@@ -330,10 +330,15 @@ Kit *QnxConfiguration::createKit(QnxArchitecture arch,
if (arch == X86) { if (arch == X86) {
QmakeProjectManager::QmakeKitInformation::setMkspec( QmakeProjectManager::QmakeKitInformation::setMkspec(
kit, FileName::fromLatin1("qnx-x86-qcc")); kit, FileName::fromLatin1("qnx-x86-qcc"));
} else {
if (qnxQt->qtVersion() >= QtVersionNumber(5, 3, 0)) {
QmakeProjectManager::QmakeKitInformation::setMkspec(
kit, FileName::fromLatin1("qnx-armle-v7-qcc"));
} else { } else {
QmakeProjectManager::QmakeKitInformation::setMkspec( QmakeProjectManager::QmakeKitInformation::setMkspec(
kit, FileName::fromLatin1("qnx-armv7le-qcc")); kit, FileName::fromLatin1("qnx-armv7le-qcc"));
} }
}
DeviceTypeKitInformation::setDeviceTypeId(kit, Constants::QNX_QNX_OS_TYPE); DeviceTypeKitInformation::setDeviceTypeId(kit, Constants::QNX_QNX_OS_TYPE);
// TODO: Add sysroot? // TODO: Add sysroot?