diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2019-09-26 19:04:38 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2019-09-27 09:43:12 +0000 |
| commit | 642be639919dbb92d9248dfd635ecbed9a0bb726 (patch) | |
| tree | 0817a3947891755e80f7ee4b1c368177193111f9 /src/plugins | |
| parent | 9caca851f45a95c3c5dd3db374e6d3440e511f19 (diff) | |
| download | qt-creator-642be639919dbb92d9248dfd635ecbed9a0bb726.tar.gz | |
QNX: Use the QNX_CONFIGURATION_EXCLUSIVE envvar in QnxToolchain
QNX_CONFIGURATION_EXCLUSIVE is responsible for license checking
failure when qcc was probed for capabilities.
Change-Id: Ib7efa9eba3b2f3cb131899aa6cb75e632446342c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qnx/qnxtoolchain.cpp | 11 | ||||
| -rw-r--r-- | src/plugins/qnx/qnxutils.cpp | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/plugins/qnx/qnxtoolchain.cpp b/src/plugins/qnx/qnxtoolchain.cpp index 62d8f79590..f1bdb8ceae 100644 --- a/src/plugins/qnx/qnxtoolchain.cpp +++ b/src/plugins/qnx/qnxtoolchain.cpp @@ -74,9 +74,12 @@ static Abis detectTargetAbis(const FilePath &sdpPath) static void setQnxEnvironment(Environment &env, const EnvironmentItems &qnxEnv) { - // We only need to set QNX_HOST and QNX_TARGET needed when running qcc + // We only need to set QNX_HOST, QNX_TARGET, and QNX_CONFIGURATION_EXCLUSIVE + // needed when running qcc foreach (const EnvironmentItem &item, qnxEnv) { - if (item.name == QLatin1String("QNX_HOST") || item.name == QLatin1String("QNX_TARGET")) + if (item.name == QLatin1String("QNX_HOST") || + item.name == QLatin1String("QNX_TARGET") || + item.name == QLatin1String("QNX_CONFIGURATION_EXCLUSIVE")) env.set(item.name, item.value); } } @@ -113,7 +116,9 @@ std::unique_ptr<ToolChainConfigWidget> QnxToolChain::createConfigurationWidget() void QnxToolChain::addToEnvironment(Environment &env) const { - if (env.expandedValueForKey("QNX_HOST").isEmpty() || env.expandedValueForKey("QNX_TARGET").isEmpty()) + if (env.expandedValueForKey("QNX_HOST").isEmpty() || + env.expandedValueForKey("QNX_TARGET").isEmpty() || + env.expandedValueForKey("QNX_CONFIGURATION_EXCLUSIVE").isEmpty()) setQnxEnvironment(env, QnxUtils::qnxEnvironment(m_sdpPath)); GccToolChain::addToEnvironment(env); diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp index 3d34dd74bb..f45764c4e0 100644 --- a/src/plugins/qnx/qnxutils.cpp +++ b/src/plugins/qnx/qnxutils.cpp @@ -46,8 +46,8 @@ using namespace Qnx::Internal; namespace { const char *EVAL_ENV_VARS[] = { - "QNX_TARGET", "QNX_HOST", "QNX_CONFIGURATION", "MAKEFLAGS", "LD_LIBRARY_PATH", - "PATH", "QDE", "CPUVARDIR", "PYTHONPATH" + "QNX_TARGET", "QNX_HOST", "QNX_CONFIGURATION", "QNX_CONFIGURATION_EXCLUSIVE", + "MAKEFLAGS", "LD_LIBRARY_PATH", "PATH", "QDE", "CPUVARDIR", "PYTHONPATH" }; } |