diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-23 14:04:14 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-24 07:40:13 +0000 |
| commit | 3653385af94ae7fe042d1c4845293b495bdc9854 (patch) | |
| tree | 8eab19463079bdd049133dd1ccb6e5ad1a4a22d9 /src/lib/qtprofilesetup | |
| parent | 5a244da9d3d1089703c4501e7ea745f424fbcf15 (diff) | |
Qt templates: Make moc rule handle C++ amalgamation correctly
In C++ amalgamation mode, the source files need to be moc'ed before
merging, because otherwise including .moc files will not work.
Task-number: QBS-1252
Change-Id: I6e4bef4b46ec7bc3cf7ce7a950b380d469cc0afd
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/qtprofilesetup')
| -rw-r--r-- | src/lib/qtprofilesetup/templates/core.qbs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs index fddd5c0e5..027230896 100644 --- a/src/lib/qtprofilesetup/templates/core.qbs +++ b/src/lib/qtprofilesetup/templates/core.qbs @@ -255,8 +255,11 @@ Module { Rule { name: "QtCoreMocRule" - inputs: ["objcpp", "cpp", "hpp"] - auxiliaryInputs: ["qt_plugin_metadata"] + property string cppInput: cpp.combineCxxSources ? "cpp.combine" : "cpp" + property string objcppInput: cpp.combineCxxSources ? "objcpp.combine" : "cpp" + property stringList additionalAuxInputs: cpp.combineCxxSources ? ["cpp", "objcpp"] : [] + inputs: [objcppInput, cppInput, "hpp"] + auxiliaryInputs: ["qt_plugin_metadata"].concat(additionalAuxInputs) excludedInputs: ["unmocable"] outputFileTags: ["hpp", "cpp", "moc_cpp", "unmocable"] outputArtifacts: { |