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

Qnx: Use Utils::Environment for qnx environment

Browse Source 
Change-Id: I499ca9be0abc15fc0c57847ff288e80612a536fe
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-10-12 19:20:37 +02:00
parent 295c688469
commit ab4207acf2
15 changed files with 114 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/qnx/qnxqtversion.cpp
View File

@@ -33,6 +33,8 @@
#include "qnxconstants.h"
#include "qnxutils.h"
#include <coreplugin/featureprovider.h>
#include <utils/hostosinfo.h>
@@ -92,35 +94,7 @@ QString QnxQtVersion::sdkDescription() const
return tr("QNX Software Development Platform:");
}
QMultiMap<QString, QString> QnxQtVersion::environment() const
QList<Utils::EnvironmentItem> QnxQtVersion::environment() const
{
// Mimic what the SDP installer puts into the system environment
QMultiMap<QString, QString> environment;
if (Utils::HostOsInfo::isWindowsHost()) {
// TODO:
//environment.insert(QLatin1String("QNX_CONFIGURATION"), QLatin1String("/etc/qnx"));
environment.insert(QLatin1String(Constants::QNX_TARGET_KEY), sdkPath() + QLatin1String("/target/qnx6"));
environment.insert(QLatin1String(Constants::QNX_HOST_KEY), sdkPath() + QLatin1String("/host/win32/x86"));
environment.insert(QLatin1String("PATH"), sdkPath() + QLatin1String("/host/win32/x86/usr/bin"));
// TODO:
//environment.insert(QLatin1String("PATH"), QLatin1String("/etc/qnx/bin"));
} else if (Utils::HostOsInfo::isAnyUnixHost()) {
environment.insert(QLatin1String("QNX_CONFIGURATION"), QLatin1String("/etc/qnx"));
environment.insert(QLatin1String(Constants::QNX_TARGET_KEY), sdkPath() + QLatin1String("/target/qnx6"));
environment.insert(QLatin1String(Constants::QNX_HOST_KEY), sdkPath() + QLatin1String("/host/linux/x86"));
environment.insert(QLatin1String("PATH"), sdkPath() + QLatin1String("/host/linux/x86/usr/bin"));
environment.insert(QLatin1String("PATH"), QLatin1String("/etc/qnx/bin"));
environment.insert(QLatin1String("LD_LIBRARY_PATH"), sdkPath() + QLatin1String("/host/linux/x86/usr/lib"));
}
environment.insert(QLatin1String("QNX_JAVAHOME"), sdkPath() + QLatin1String("/_jvm"));
environment.insert(QLatin1String("MAKEFLAGS"), QLatin1String("-I") + sdkPath() + QLatin1String("/target/qnx6/usr/include"));
return environment;
return QnxUtils::qnxEnvironment(sdkPath());
}