De-obfuscate Executor.

Transformers are what jobs work on, not artifacts.

Change-Id: Ib267ec247dd6d165347511f0a0fdb3db00c58832
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/lib/corelib/buildgraph/executorjob.cpp b/src/lib/corelib/buildgraph/executorjob.cpp
index 281d82e36..f747ca7d8 100644
--- a/src/lib/corelib/buildgraph/executorjob.cpp
+++ b/src/lib/corelib/buildgraph/executorjob.cpp
@@ -29,6 +29,7 @@
 
 #include "executorjob.h"
 
+#include "artifact.h"
 #include "command.h"
 #include "jscommandexecutor.h"
 #include "processcommandexecutor.h"
@@ -78,7 +79,7 @@ void ExecutorJob::setDryRun(bool enabled)
     m_jsCommandExecutor->setDryRunEnabled(enabled);
 }
 
-void ExecutorJob::run(Transformer *t, const ResolvedProductPtr &product)
+void ExecutorJob::run(Transformer *t)
 {
     QBS_ASSERT(m_currentCommandIdx == -1, return);
 
@@ -88,8 +89,9 @@ void ExecutorJob::run(Transformer *t, const ResolvedProductPtr &product)
     }
 
     t->propertiesRequestedInCommands.clear();
-    m_processCommandExecutor->setProcessEnvironment(product->buildEnvironment);
-
+    QBS_CHECK(!t->outputs.isEmpty());
+    m_processCommandExecutor->setProcessEnvironment(
+                (*t->outputs.begin())->product->buildEnvironment);
     m_transformer = t;
     runNextCommand();
 }