diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2018-03-23 14:59:57 +0100 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2018-03-28 10:08:41 +0000 |
| commit | 785ce8f01d3601f680da6d743d5f692c81d86579 (patch) | |
| tree | 6219c0a8914138f75443586b6e7313840940520b | |
| parent | f553ff6cb8ccea033e639f02a2373dcf3a8a98fb (diff) | |
Fix conversion of .moc and .cbt files
Fixed a bug in the conversion to Qt/MSBuild, where .moc and .cbt files
where not processed and remained as custom build steps in the converted
project.
Change-Id: I6b933c1dd6d5e7761ba036ce4a302aad7f028798
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/qtprojectlib/MsBuildProject.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qtprojectlib/MsBuildProject.cs b/src/qtprojectlib/MsBuildProject.cs index 06d78097..57d23304 100644 --- a/src/qtprojectlib/MsBuildProject.cs +++ b/src/qtprojectlib/MsBuildProject.cs @@ -455,7 +455,9 @@ namespace QtProjectLib // with a single .cpp custom build step var mocCbtCustomBuilds = GetCustomBuilds(QtMoc.ToolExecName) .Where(x => - ((string)x.Attribute("Include")).EndsWith(".moc.cbt", + ((string)x.Attribute("Include")).EndsWith(".cbt", + StringComparison.InvariantCultureIgnoreCase) + || ((string)x.Attribute("Include")).EndsWith(".moc", StringComparison.InvariantCultureIgnoreCase)) .GroupBy(cbt => CustomBuildMocInput(cbt)); |