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/plugins/scanner | |
| 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/plugins/scanner')
| -rw-r--r-- | src/plugins/scanner/cpp/cppscanner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/scanner/cpp/cppscanner.cpp b/src/plugins/scanner/cpp/cppscanner.cpp index 2735aa378..4bee84dd3 100644 --- a/src/plugins/scanner/cpp/cppscanner.cpp +++ b/src/plugins/scanner/cpp/cppscanner.cpp @@ -257,7 +257,7 @@ static const char **additionalFileTags(void *opaq, int *size) { static const char *thMocCpp[] = { "moc_cpp" }; static const char *thMocHpp[] = { "moc_hpp" }; - static const char *thMocPluginHpp[] = { "moc_plugin_hpp" }; + static const char *thMocPluginHpp[] = { "moc_hpp_plugin" }; Opaq *opaque = static_cast<Opaq*>(opaq); if (opaque->hasQObjectMacro) { |