From 1860ace6b4678ddb700b65b64631544073654550 Mon Sep 17 00:00:00 2001 From: Mehdi Fekari Date: Fri, 18 Jan 2013 09:50:47 -0500 Subject: [PATCH] Qnx: Fix the sysroot path value on BB10 generated kits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie83e303a88a9e9f7e5a28ad91a6654624091e8ed Reviewed-by: Tobias Nätterlund Reviewed-by: Tobias Hunger --- src/plugins/qnx/blackberryconfiguration.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/plugins/qnx/blackberryconfiguration.cpp b/src/plugins/qnx/blackberryconfiguration.cpp index 741cbc2a531..991967ca21d 100644 --- a/src/plugins/qnx/blackberryconfiguration.cpp +++ b/src/plugins/qnx/blackberryconfiguration.cpp @@ -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")));