From 642be639919dbb92d9248dfd635ecbed9a0bb726 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Thu, 26 Sep 2019 19:04:38 +0200 Subject: [PATCH] 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 Reviewed-by: hjk --- src/plugins/qnx/qnxtoolchain.cpp | 11 ++++++++--- 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 62d8f795904..f1bdb8ceae6 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 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 3d34dd74bbc..f45764c4e04 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" }; }