replace incorrect uses of fixPathToLocalOS() (mostly)

in most cases, it actually means normalizePath() (because the file name is
used with qt i/o functions afterwards).
this affects QMakeLocalFile::local() as well, so many not immediately
obvious places are affected as well.
there was also one case of fixPathToTargetOS() falling into this category.
this is mostly a no-op, as the qt functions are agnostic to the path
separator.

in some other cases (in particular in the vcproj generator), it actually
means fixPathToTargetOS().
this is mostly a no-op as well, as the two functions are equal except on
msys anyway.

in the <meta file>FileName() functions, the use of a fixPath*() function
is bogus in the first place - fileFixify() already does
fixPathToTargetOS(), and this is correct when the file name is used
verbatim in a make command (which it is). otherwise it's irrelevant.

Change-Id: I26712da8f888c704f8b7f42dbe24c941b6ad031d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index a6ca07efee..3bb70c5c19 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -1900,11 +1900,11 @@ bool VCXProjectWriter::outputFileConfig(OutputFilterData *d, XmlOutput &xml, Xml
                 fileAdded = true;
 
                 xmlFilter << tag("CustomBuild")
-                    << attrTag("Include",Option::fixPathToLocalOS(filename))
+                    << attrTag("Include", Option::fixPathToTargetOS(filename))
                     << attrTagS("Filter", filter.Name);
 
                 xml << tag("CustomBuild")
-                    << attrTag("Include",Option::fixPathToLocalOS(filename));
+                    << attrTag("Include", Option::fixPathToTargetOS(filename));
 
                 if (filter.Name.startsWith("Form Files")
                         || filter.Name.startsWith("Generated Files")
@@ -1963,7 +1963,7 @@ bool VCXProjectWriter::outputFileConfig(OutputFilterData *d, XmlOutput &xml, Xml
 void VCXProjectWriter::outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter,
                                         const QString &filePath, const QString &filterName)
 {
-    const QString nativeFilePath = Option::fixPathToLocalOS(filePath);
+    const QString nativeFilePath = Option::fixPathToTargetOS(filePath);
     if (filterName.startsWith("Source Files")) {
         xmlFilter << tag("ClCompile")
                   << attrTag("Include", nativeFilePath)