diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2014-11-12 13:55:25 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2014-11-13 20:04:09 +0100 |
| commit | 5c58db516a55d4f6a5e5899617505898ce7bd969 (patch) | |
| tree | 11b83cdd4c26a32e90b379ee75ec52b5c51c1fc2 | |
| parent | 74ae86a660abfbbdedfad1fe284a79af73fa4b78 (diff) | |
Add the custom build step for PCH generated through source
This fixes a regression introduced by
04d3a89e20d49a3b5015b071bfdedc81973b090c as it left out the custom build
step for the source code file generated for PCH.
Task-number: QTBUG-42596
Change-Id: I53d5a36b842dcffbde2657910e6a96dca0e99c7b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index 7effbaa8c4..1f51ff0342 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -1915,10 +1915,10 @@ bool VCXProjectWriter::outputFileConfig(OutputFilterData *d, XmlOutput &xml, Xml } // Actual XML output ---------------------------------- - if (hasCustomBuildStep || filter.useCompilerTool + if (hasCustomBuildStep || filter.useCustomBuildTool || filter.useCompilerTool || !d->inBuild || filter.Name.startsWith("Deployment Files")) { - if (hasCustomBuildStep) + if (hasCustomBuildStep || filter.useCustomBuildTool) { if (!fileAdded) { fileAdded = true; |