VS generator: Don't prepend $(ProjectDir) to absolute paths

Task-number: QBS-1081
Change-Id: I62f2016f87d0186eea6f8c7e3e784ab28f72f981
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp
index bc14f3921..d51534159 100644
--- a/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp
+++ b/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp
@@ -324,8 +324,12 @@ void MSBuildQbsProductProject::addFiles(const GeneratableProject &project,
                     });
                 }
                 auto fileItem = sourceFileNodes[filePath];
-                fileItem->setFilePath(QStringLiteral("$(ProjectDir)")
-                                      + project.baseBuildDirectory().relativeFilePath(filePath));
+                QString path = project.baseBuildDirectory().relativeFilePath(filePath);
+                // The path still might not be relative (for example if the file item is
+                // located on a different drive)
+                if (QFileInfo(path).isRelative())
+                    path = QStringLiteral("$(ProjectDir)") + path;
+                fileItem->setFilePath(path);
                 if (group.isEnabled())
                     sourceFileEnabledConfigurations[filePath] << productDataIt.key();
             }