From 332db8de18cdc9d62d5eae9c50190d630d8dccbf Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 8 Jul 2024 15:16:55 +0200
Subject: [PATCH] qbs build: Do not use relative paths in Export items

Those will be interpreted relative to the importing product in the
future.

Change-Id: I57f6159053acf1e0334d3289de1f93545e2e871b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 qbs/imports/QtcPlugin.qbs              | 2 +-
 src/libs/3rdparty/libvterm/vterm.qbs   | 2 +-
 src/libs/modelinglib/modelinglib.qbs   | 4 ++--
 src/libs/solutions/spinner/spinner.qbs | 2 +-
 src/libs/solutions/tasking/tasking.qbs | 5 ++++-
 src/libs/utils/utils.qbs               | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs
index d06f99385e4..f4ee221695f 100644
--- a/qbs/imports/QtcPlugin.qbs
+++ b/qbs/imports/QtcPlugin.qbs
@@ -46,6 +46,6 @@ QtcProduct {
     Export {
         Depends { name: "cpp" }
         Depends { name: "ExtensionSystem" }
-        cpp.includePaths: ".."
+        cpp.includePaths: exportingProduct.sourceDirectory + "/.."
     }
 }
diff --git a/src/libs/3rdparty/libvterm/vterm.qbs b/src/libs/3rdparty/libvterm/vterm.qbs
index e35658908da..4c3a08e519e 100644
--- a/src/libs/3rdparty/libvterm/vterm.qbs
+++ b/src/libs/3rdparty/libvterm/vterm.qbs
@@ -30,6 +30,6 @@ QtcLibrary {
 
     Export {
         Depends { name: "cpp" }
-        cpp.includePaths: "include"
+        cpp.includePaths: exportingProduct.sourceDirectory + "/include"
     }
 }
diff --git a/src/libs/modelinglib/modelinglib.qbs b/src/libs/modelinglib/modelinglib.qbs
index 9929bf33c03..54ad0cad64c 100644
--- a/src/libs/modelinglib/modelinglib.qbs
+++ b/src/libs/modelinglib/modelinglib.qbs
@@ -396,8 +396,8 @@ QtcLibrary {
 
     Export {
         cpp.includePaths: [
-            ".",
-            "./qtserialization/inc"
+            exportingProduct.sourceDirectory,
+            exportingProduct.sourceDirectory + "/qtserialization/inc"
         ]
     }
 }
diff --git a/src/libs/solutions/spinner/spinner.qbs b/src/libs/solutions/spinner/spinner.qbs
index d02858d0484..74fefc89875 100644
--- a/src/libs/solutions/spinner/spinner.qbs
+++ b/src/libs/solutions/spinner/spinner.qbs
@@ -14,7 +14,7 @@ QtcLibrary {
 
     Export {
         Depends { name: "cpp" }
-        cpp.includePaths: ".."
+        cpp.includePaths: exportingProduct.sourceDirectory + "/.."
     }
 }
 
diff --git a/src/libs/solutions/tasking/tasking.qbs b/src/libs/solutions/tasking/tasking.qbs
index 3b69d7449ff..f0601530d1c 100644
--- a/src/libs/solutions/tasking/tasking.qbs
+++ b/src/libs/solutions/tasking/tasking.qbs
@@ -22,7 +22,10 @@ QtcLibrary {
 
     Export {
         Depends { name: "cpp" }
-        cpp.includePaths: ["..", "../.."]
+        cpp.includePaths: [
+            exportingProduct.sourceDirectory + "/..",
+            exportingProduct.sourceDirectory + "/../.."
+        ]
     }
 }
 
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index afc0f202aa7..e73c9ef9230 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -475,6 +475,6 @@ QtcLibrary {
     Export {
         Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
         Depends { name: "Tasking" }
-        cpp.includePaths: "mimetypes2"
+        cpp.includePaths: exportingProduct.sourceDirectory + "/mimetypes2"
     }
 }