Commit 1860ace6 authored by Mehdi Fekari's avatar Mehdi Fekari Committed by Tobias Hunger
Browse files

Qnx: Fix the sysroot path value on BB10 generated kits



Change-Id: Ie83e303a88a9e9f7e5a28ad91a6654624091e8ed
Reviewed-by: default avatarTobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 23b7dc5b
......@@ -80,15 +80,11 @@ bool BlackBerryConfiguration::setConfig(const QString &ndkPath)
m_config.qnxEnv = QnxUtils::parseEnvironmentFile(QnxUtils::envFilePath(ndkPath));
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());
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(sRootDir).exists())
m_config.sysRoot = Utils::FileName::fromString(sRootDir);
if (QDir(ndkTarget).exists())
m_config.sysRoot = Utils::FileName::fromString(ndkTarget);
QString qnxHost = m_config.qnxEnv.value(QLatin1String("QNX_HOST"));
Utils::FileName qmakePath = QnxUtils::executableWithExtension(Utils::FileName::fromString(qnxHost + QLatin1String("/usr/bin/qmake")));
......
Markdown is supported
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