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

Qnx: update the bbnk-env parser for internal NDKs

Browse Source 
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 <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
This commit is contained in:
El Mehdi Fekari
2013-07-30 11:09:47 +02:00
committed by Mehdi Fekari
parent 96cd2e64d4
commit 8d6e995c82
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qnx/qnxutils.cpp
View File

@@ -100,10 +100,12 @@ QMultiMap<QString, QString> QnxUtils::parseEnvironmentFile(const QString &fileNa
QString value = line.mid(equalIndex + 1); 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 )" // BASE_DIR="$( cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
// We already know the NDK path so we can set the variable value // 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(); value = QFileInfo(fileName).dir().absolutePath();
if (Utils::HostOsInfo::isWindowsHost()) { if (Utils::HostOsInfo::isWindowsHost()) {