From 1ce8f62cc2bf2b7a23047011d2d086e18a586428 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@digia.com>
Date: Mon, 25 Mar 2013 12:03:37 +0100
Subject: [PATCH] fix source file paths of qbs projects on Windows

Task-number: QBS-238

Change-Id: I8f9279836a10d13998e00dafa830a38748c2aa6a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/qbsprojectmanager/qbsnodes.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qbsprojectmanager/qbsnodes.cpp b/src/plugins/qbsprojectmanager/qbsnodes.cpp
index 0d897640417..a7717929b1a 100644
--- a/src/plugins/qbsprojectmanager/qbsnodes.cpp
+++ b/src/plugins/qbsprojectmanager/qbsnodes.cpp
@@ -31,6 +31,7 @@
 
 #include "qbsproject.h"
 
+#include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 
 #include <qbs.h>
@@ -86,7 +87,10 @@ public:
             if (child->isFile())
                 return;
 
-            node->name = node->name + QLatin1Char('/') + child->name;
+            if (!Utils::HostOsInfo::isWindowsHost() || !node->name.isEmpty())
+                node->name = node->name + QLatin1Char('/') + child->name;
+            else
+                node->name = child->name;
             node->children = child->children;
 
             foreach (FileTreeNode *tmpChild, node->children)
@@ -108,7 +112,8 @@ public:
         QString p = name;
         FileTreeNode *node = parent;
         while (node) {
-            p = node->name + QLatin1Char('/') + p;
+            if (!Utils::HostOsInfo::isWindowsHost() || !node->name.isEmpty())
+                p = node->name + QLatin1Char('/') + p;
             node = node->parent;
         }
         return p;