diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2013-01-15 13:45:31 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-01-24 15:11:21 +0100 |
| commit | 9d057a4f2cf21a0e85f2f81def7c3161faaaa211 (patch) | |
| tree | a476e8655519149f3aa97f3393ddf36c4ae386d7 | |
| parent | 3b72ca6cb0005b68781eedb718ad56a9a069ba56 (diff) | |
| download | qt-creator-9d057a4f2cf21a0e85f2f81def7c3161faaaa211.tar.gz | |
Set Qt Creator environment to qbs
Change-Id: I0fff11b621bc4a85d774dcf8b1538286a78ff40a
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsproject.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
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) |