From d366546a227446d65b57671e1785de622f66830d Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Fri, 26 Nov 2010 16:13:54 +0100
Subject: [PATCH] Symbian: Pass on license file information
Pass on license file information from Qt Creator's environment to the
build environment if that is needed (RVCT compilers).
---
src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
index 729b7b32d18..86700690ab0 100644
--- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
@@ -94,7 +94,8 @@ QStringList RVCTToolChain::configuredEnvironment()
const QString varName = binVarName.left(binVarName.count() - 3 /* BIN */);
QStringList environment = QProcessEnvironment::systemEnvironment().toStringList();
foreach (const QString &v, environment) {
- if (v.startsWith(varName) && !v.startsWith(binVarName)) {
+ if ((v.startsWith(varName) && !v.startsWith(binVarName))
+ || v.startsWith(QLatin1String("ARMLMD_LICENSE_FILE="))) {
m_additionalEnvironment.append(v);
}
}
--
GitLab