diff options
| author | James McDonnell <[email protected]> | 2014-09-17 09:46:29 -0400 |
|---|---|---|
| committer | James McDonnell <[email protected]> | 2014-09-18 15:34:10 +0200 |
| commit | 2b89e759cf23c1712772a882dd02658d9756ed5c (patch) | |
| tree | ed9fd7c4ce615075e2c7b3215185e082e472a438 /src/plugins/qnx/qnxutils.cpp | |
| parent | 3088c9725415d83c7e34999b74a4bfbbe4829c45 (diff) | |
QNX: OS/X support
On OS/X, use the darwin subdirectories in the environment. Makes it
easier for those of us with access to the OS/X based QNX tools to use
Qt Creator on OS/X.
Change-Id: Iebc3a89978e6211781404bfc8a4ba95a3523d8b5
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/qnx/qnxutils.cpp')
| -rw-r--r-- | src/plugins/qnx/qnxutils.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp index 531d734bc28..3963b4ebc3e 100644 --- a/src/plugins/qnx/qnxutils.cpp +++ b/src/plugins/qnx/qnxutils.cpp @@ -305,6 +305,15 @@ QList<Utils::EnvironmentItem> QnxUtils::qnxEnvironment(const QString &sdkPath) // TODO: //environment.insert(QLatin1String("PATH"), QLatin1String("/etc/qnx/bin")); + } else if (Utils::HostOsInfo::isMacHost()) { + environmentItems.append(Utils::EnvironmentItem(QLatin1String("QNX_CONFIGURATION"), QLatin1String("/etc/qnx"))); + environmentItems.append(Utils::EnvironmentItem(QLatin1String(Constants::QNX_TARGET_KEY), sdkPath + QLatin1String("/target/qnx6"))); + environmentItems.append(Utils::EnvironmentItem(QLatin1String(Constants::QNX_HOST_KEY), sdkPath + QLatin1String("/host/darwin/x86"))); + + + environmentItems.append(Utils::EnvironmentItem(QLatin1String("PATH"), sdkPath + QLatin1String("/host/darwin/x86/usr/bin:/etc/qnx/bin:${PATH}"))); + + environmentItems.append(Utils::EnvironmentItem(QLatin1String("LD_LIBRARY_PATH"), sdkPath + QLatin1String("/host/darwin/x86/usr/lib:${LD_LIBRARY_PATH}"))); } else if (Utils::HostOsInfo::isAnyUnixHost()) { environmentItems.append(Utils::EnvironmentItem(QLatin1String("QNX_CONFIGURATION"), QLatin1String("/etc/qnx"))); environmentItems.append(Utils::EnvironmentItem(QLatin1String(Constants::QNX_TARGET_KEY), sdkPath + QLatin1String("/target/qnx6"))); |