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

Qnx: Fix the sysroot path value on BB10 generated kits

Browse Source 
Change-Id: Ie83e303a88a9e9f7e5a28ad91a6654624091e8ed
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Mehdi Fekari
2013-01-18 09:50:47 -05:00
committed by Tobias Hunger
parent 23b7dc5b5c
commit 1860ace6b4
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,15 +80,11 @@ bool BlackBerryConfiguration::setConfig(const QString &ndkPath)
m_config.qnxEnv = QnxUtils::parseEnvironmentFile(QnxUtils::envFilePath(ndkPath)); m_config.qnxEnv = QnxUtils::parseEnvironmentFile(QnxUtils::envFilePath(ndkPath));
QString ndkTarget = m_config.qnxEnv.value(QLatin1String("QNX_TARGET")); QString ndkTarget = m_config.qnxEnv.value(QLatin1String("QNX_TARGET"));
QString cpuDir = m_config.qnxEnv.value(QLatin1String("CPUVARDIR"));
QString sep = QString::fromLatin1("%1qnx6").arg(QDir::separator()); QString sep = QString::fromLatin1("%1qnx6").arg(QDir::separator());
m_config.targetName = ndkTarget.split(sep).first().split(QDir::separator()).last(); m_config.targetName = ndkTarget.split(sep).first().split(QDir::separator()).last();
QString sRootDir = QString::fromLatin1("%1%2%3").arg(ndkTarget, QDir::separator(), cpuDir); if (QDir(ndkTarget).exists())
m_config.sysRoot = Utils::FileName::fromString(ndkTarget);
if (QDir(sRootDir).exists())
m_config.sysRoot = Utils::FileName::fromString(sRootDir);
QString qnxHost = m_config.qnxEnv.value(QLatin1String("QNX_HOST")); QString qnxHost = m_config.qnxEnv.value(QLatin1String("QNX_HOST"));
Utils::FileName qmakePath = QnxUtils::executableWithExtension(Utils::FileName::fromString(qnxHost + QLatin1String("/usr/bin/qmake"))); Utils::FileName qmakePath = QnxUtils::executableWithExtension(Utils::FileName::fromString(qnxHost + QLatin1String("/usr/bin/qmake")));