Moc doesn't start if source path or filename contains space(s)

Moc fails to start if source path or filename contains space(s) comma(s). For example, if your source file is "C:\Path,to,source\source.h", it will fail.
The workaround and correction in VS Addin sources is to modify qtmoc.targets by adding some quotes:
line 426/427 should be:

      <output_relative
>$([MSBuild]::MakeRelative($(ProjectDir), '%(QtMoc.OutputFile)').TrimStart('\'))</output_relative>

line 430/431 should be:
 

      <input_relative
>$([MSBuild]::MakeRelative($(ProjectDir), '%(QtMoc.InputFile)').TrimStart('\'))</input_relative>

This is a regression since it had been corrected in 2.5.1 rev.18.