From 8d6e995c82527230128347d5a741b993958abad9 Mon Sep 17 00:00:00 2001 From: El Mehdi Fekari Date: Tue, 30 Jul 2013 11:09:47 +0200 Subject: [PATCH] Qnx: update the bbnk-env parser for internal NDKs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In recent internal NDK versions (10.2) some new environment variables are introduced (they are evaluated when soucring the bbnk-script) that QNX_TARGET and QNX_HOST are depending on. This patch is a workaroud, in the future the parser should be deprecated/replaced to make the plugin less depending on the bbndk-scrit changes. Change-Id: I8d2dc7f0a87cbada6f8807df2bafdfd14476e01d Reviewed-by: Tobias Nätterlund Reviewed-by: Nicolas Arnaud-Cormos --- src/plugins/qnx/qnxutils.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp index 0c7de30c438..ad4ee89361e 100644 --- a/src/plugins/qnx/qnxutils.cpp +++ b/src/plugins/qnx/qnxutils.cpp @@ -100,10 +100,12 @@ QMultiMap QnxUtils::parseEnvironmentFile(const QString &fileNa QString value = line.mid(equalIndex + 1); - // BASE_DIR variable is evaluated when souring the bbnk-env script + // BASE_DIR (and BASE_DIR_REPLACED in some recent internal versions) variable is + // evaluated when souring the bbnk-env script // BASE_DIR="$( cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )" // We already know the NDK path so we can set the variable value - if (var == QLatin1String("BASE_DIR")) + // TODO: Do not parse bbnk-env! + if (var == QLatin1String("BASE_DIR") || var == QLatin1String("BASE_DIR_REPLACED")) value = QFileInfo(fileName).dir().absolutePath(); if (Utils::HostOsInfo::isWindowsHost()) {