aboutsummaryrefslogtreecommitdiffstats
path: root/src/app/qbs
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@digia.com>2013-06-05 16:48:02 +0200
committerTobias Hunger <tobias.hunger@digia.com>2013-06-06 16:41:48 +0200
commit3efc5eff61ab8b5479ac01e9bef2120bb9d687fe (patch)
tree8cb3c5f77df08e40f2de61eda4ad1f69b06d5d5d /src/app/qbs
parent9dcb3b83cfb69a17d98df9bcac9089671d3c1086 (diff)
Pass the environment to be used as part of the setupprojectparameters
Pass in the environment to be used when resolving a project via the SetupProjectParameters. Store this environment and use it when building. Remove APIs for passing an environment when building. Change-Id: Icfd345bac27999b3e4191061a31d9df4f24cbd7f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/app/qbs')
-rw-r--r--src/app/qbs/commandlinefrontend.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp
index c0a9afd98..eab67ac44 100644
--- a/src/app/qbs/commandlinefrontend.cpp
+++ b/src/app/qbs/commandlinefrontend.cpp
@@ -356,14 +356,13 @@ int CommandLineFrontend::runShell()
void CommandLineFrontend::build()
{
- QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
if (m_parser.products().isEmpty()) {
foreach (const Project &project, m_projects)
- m_buildJobs << project.buildAllProducts(m_parser.buildOptions(), env, this);
+ m_buildJobs << project.buildAllProducts(m_parser.buildOptions(), this);
} else {
const ProductMap &products = productsToUse();
for (ProductMap::ConstIterator it = products.begin(); it != products.end(); ++it)
- m_buildJobs << it.key().buildSomeProducts(it.value(), m_parser.buildOptions(), env, this);
+ m_buildJobs << it.key().buildSomeProducts(it.value(), m_parser.buildOptions(), this);
}
connectBuildJobs();