From 9d057a4f2cf21a0e85f2f81def7c3161faaaa211 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 15 Jan 2013 13:45:31 +0100 Subject: Set Qt Creator environment to qbs Change-Id: I0fff11b621bc4a85d774dcf8b1538286a78ff40a --- src/plugins/qbsprojectmanager/qbsproject.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index a416ee0d84..104adea05c 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -233,7 +233,15 @@ qbs::BuildJob *QbsProject::build(const qbs::BuildOptions &opts) { if (!m_rootProjectNode || !m_rootProjectNode->project()) return 0; - return m_rootProjectNode->project()->buildAllProducts(opts); + if (!activeTarget() || !activeTarget()->kit()) + return 0; + ProjectExplorer::BuildConfiguration *bc = 0; + bc = activeTarget()->activeBuildConfiguration(); + if (!bc) + return 0; + + QProcessEnvironment env = bc->environment().toProcessEnvironment(); + return m_rootProjectNode->project()->buildAllProducts(opts, env); } qbs::CleanJob *QbsProject::clean(const qbs::BuildOptions &opts, bool everything) -- cgit v1.2.1