diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-24 10:10:15 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-24 11:01:46 +0000 |
| commit | 7d9f8bde75cbd6ed16c925706a8fc6bb3fa1226c (patch) | |
| tree | 6d75b873562d1c7cd0f2c9b48d5af47a098152de /src/lib/qtprofilesetup | |
| parent | 501bb599bfcfa7b98227f7fc295cd8e0a09bc927 (diff) | |
Qt templates: Fix moc rule
Commit 3653385af9 broke moc on macOS.
Change-Id: Ie0875a1fcc7b891c241ab1cbd00ce6a908cd04ec
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/qtprofilesetup')
| -rw-r--r-- | src/lib/qtprofilesetup/templates/core.qbs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs index 027230896..cd7428423 100644 --- a/src/lib/qtprofilesetup/templates/core.qbs +++ b/src/lib/qtprofilesetup/templates/core.qbs @@ -256,10 +256,16 @@ Module { Rule { name: "QtCoreMocRule" property string cppInput: cpp.combineCxxSources ? "cpp.combine" : "cpp" - property string objcppInput: cpp.combineCxxSources ? "objcpp.combine" : "cpp" - property stringList additionalAuxInputs: cpp.combineCxxSources ? ["cpp", "objcpp"] : [] + property string objcppInput: cpp.combineObjcxxSources ? "objcpp.combine" : "objcpp" inputs: [objcppInput, cppInput, "hpp"] - auxiliaryInputs: ["qt_plugin_metadata"].concat(additionalAuxInputs) + auxiliaryInputs: { + var auxInputs = ["qt_plugin_metadata"]; + if (cpp.combineCxxSources) + auxInputs.push("cpp"); + if (cpp.combineObjcxxSources) + auxInputs.push("objcpp"); + return auxInputs; + } excludedInputs: ["unmocable"] outputFileTags: ["hpp", "cpp", "moc_cpp", "unmocable"] outputArtifacts: { |