From a57f930036172cec4e1778ba79b4c41e55fbaf93 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@theqtcompany.com>
Date: Tue, 1 Mar 2016 16:08:38 +0100
Subject: [PATCH] qbs build: Adapt to new implementation of qbs.FileInfo.

We cannot pass in a relative path as the first argument of
FileInfo.relativePath() anymore, which we relied on in some places. The
old implementation assumed that if both arguments were relative paths,
they had an implicit common base directory.

Change-Id: I55ee62e478da761cf085587c57220d5fb1ac990e
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
---
 qbs/imports/QtcTool.qbs  |  8 ++++----
 src/libs/utils/utils.qbs |  4 ++--
 src/src.qbs              | 12 +++++++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/qbs/imports/QtcTool.qbs b/qbs/imports/QtcTool.qbs
index fbd97336001..a1f228e2b23 100644
--- a/qbs/imports/QtcTool.qbs
+++ b/qbs/imports/QtcTool.qbs
@@ -7,10 +7,10 @@ QtcProduct {
     installDir:  project.ide_libexec_path
 
     cpp.rpaths: {
-        var relativePathToLibs
-                = FileInfo.relativePath(project.ide_libexec_path, project.ide_library_path);
-        var relativePathToPlugins
-                = FileInfo.relativePath(project.ide_libexec_path, project.ide_plugin_path);
+        var relativePathToLibs = FileInfo.relativePath('/' + project.ide_libexec_path,
+                                                       '/' + project.ide_library_path);
+        var relativePathToPlugins = FileInfo.relativePath('/' + project.ide_libexec_path,
+                                                          '/' + project.ide_plugin_path);
         var prefix = qbs.targetOS.contains("osx") ? "@executable_path" : "$ORIGIN";
         return [
             FileInfo.joinPaths(prefix, relativePathToLibs),
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 5f7af987657..85a84b566f2 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -6,8 +6,8 @@ QtcLibrary {
 
     cpp.defines: base.concat([
         "QTCREATOR_UTILS_LIB",
-        "QTC_REL_TOOLS_PATH=\"" + FileInfo.relativePath(project.ide_bin_path,
-                                                        project.ide_libexec_path) + "\""
+        "QTC_REL_TOOLS_PATH=\"" + FileInfo.relativePath('/' + project.ide_bin_path,
+                                                        '/' + project.ide_libexec_path) + "\""
     ])
     cpp.dynamicLibraries: {
         var libs = [];
diff --git a/src/src.qbs b/src/src.qbs
index c1dd5905d42..ff8007be734 100644
--- a/src/src.qbs
+++ b/src/src.qbs
@@ -29,16 +29,18 @@ Project {
         property bool installApiHeaders: false
         property string libInstallDir: project.ide_library_path
         property stringList libRPaths:  qbs.targetOS.contains("osx")
-            ? ["@loader_path/" + FileInfo.relativePath(appInstallDir, libInstallDir)]
+            ? ["@loader_path/" + FileInfo.relativePath('/' + appInstallDir, '/' + libInstallDir)]
             : ["$ORIGIN/..", "$ORIGIN/../" + project.ide_library_path]
         property string resourcesInstallDir: project.ide_data_path + "/qbs"
         property string pluginsInstallDir: project.ide_plugin_path
         property string appInstallDir: project.ide_bin_path
         property string libexecInstallDir: project.ide_libexec_path
-        property string relativeLibexecPath: FileInfo.relativePath(appInstallDir, libexecInstallDir)
-        property string relativePluginsPath: FileInfo.relativePath(appInstallDir, pluginsInstallDir)
-        property string relativeSearchPath: FileInfo.relativePath(appInstallDir,
-                                                                  resourcesInstallDir)
+        property string relativeLibexecPath: FileInfo.relativePath('/' + appInstallDir,
+                                                                   '/' + libexecInstallDir)
+        property string relativePluginsPath: FileInfo.relativePath('/' + appInstallDir,
+                                                                   '/' + pluginsInstallDir)
+        property string relativeSearchPath: FileInfo.relativePath('/' + appInstallDir,
+                                                                  '/' + resourcesInstallDir)
 
         references: [
             qbsBaseDir + "/src/lib/libs.qbs",