diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-02-10 18:08:01 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-02-13 15:33:27 +0100 |
| commit | e73f60919079fc7cb0f0ad6d50b1a364c7b0d2a6 (patch) | |
| tree | 3ce15f1f9b336063d591999ce325ce28a6e21320 /src/lib/corelib/buildgraph/executorjob.cpp | |
| parent | a3634a6bbb193c47cdec887a6b29356c979961aa (diff) | |
support transformers with an unknown number of outputs
To support different types of nodes in the build graph, we introduce
the base class BuildGraphNode. Artifact now derives from BuildGraphNode.
A RuleNode class is introduced that represents a rule in the build graph.
Rules are applied in the build phase and not in a pre-build phase
anymore.
The handling of moc has been revisited. The fixed automoc pre-build
phase is no more.
This is the squashed merge of a feature branch.
Task-number: QBS-370
Change-Id: If27cdc51cba8c9542e4282c2caa456faa723aeff
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/executorjob.cpp')
| -rw-r--r-- | src/lib/corelib/buildgraph/executorjob.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/buildgraph/executorjob.cpp b/src/lib/corelib/buildgraph/executorjob.cpp index 3ad3df6d5..281d82e36 100644 --- a/src/lib/corelib/buildgraph/executorjob.cpp +++ b/src/lib/corelib/buildgraph/executorjob.cpp @@ -117,7 +117,7 @@ void ExecutorJob::runNextCommand() return; } - const AbstractCommand * const command = m_transformer->commands.at(m_currentCommandIdx); + const AbstractCommandPtr &command = m_transformer->commands.at(m_currentCommandIdx); switch (command->type()) { case AbstractCommand::ProcessCommandType: m_currentCommandExecutor = m_processCommandExecutor; @@ -129,7 +129,7 @@ void ExecutorJob::runNextCommand() qFatal("Missing implementation for command type %d", command->type()); } - m_currentCommandExecutor->start(m_transformer, command); + m_currentCommandExecutor->start(m_transformer, command.data()); } void ExecutorJob::onCommandError(const ErrorInfo &err) |