Pass the product to PathTools functions for proper encapsulation.

Change-Id: Idcfbb37830e56b09af56d087b710b7e64fb66c0c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

3 files changed, 12 insertions, 12 deletions

diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs
index 4f2149717..e70d3a8ac 100644
--- a/share/qbs/modules/cpp/DarwinGCC.qbs
+++ b/share/qbs/modules/cpp/DarwinGCC.qbs
@@ -318,7 +318,7 @@ UnixGCC {
         inputs: ["application"]
 
         Artifact {
-            fileName: product.destinationDirectory + "/" + PathTools.dwarfDsymFileName()
+            fileName: product.destinationDirectory + "/" + PathTools.dwarfDsymFileName(product)
             fileTags: ["application_dsym"]
         }
 
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index dccadbde0..772dc0782 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -67,32 +67,32 @@ CppModule {
         usings: ["dynamiclibrary_copy", "staticlibrary", "frameworkbundle"]
 
         Artifact {
-            fileName: product.destinationDirectory + "/" + PathTools.dynamicLibraryFilePath()
+            fileName: product.destinationDirectory + "/" + PathTools.dynamicLibraryFilePath(product)
             fileTags: ["dynamiclibrary"]
         }
 
         // libfoo
         Artifact {
-            fileName: product.destinationDirectory + "/" + PathTools.dynamicLibraryFileName(undefined, 0)
+            fileName: product.destinationDirectory + "/" + PathTools.dynamicLibraryFileName(product, undefined, 0)
             fileTags: ["dynamiclibrary_symlink"]
         }
 
         // libfoo.1
         Artifact {
-            fileName: product.destinationDirectory + "/" + PathTools.dynamicLibraryFileName(undefined, 1)
+            fileName: product.destinationDirectory + "/" + PathTools.dynamicLibraryFileName(product, undefined, 1)
             fileTags: ["dynamiclibrary_symlink"]
         }
 
         // libfoo.1.0
         Artifact {
-            fileName: product.destinationDirectory + "/" + PathTools.dynamicLibraryFileName(undefined, 2)
+            fileName: product.destinationDirectory + "/" + PathTools.dynamicLibraryFileName(product, undefined, 2)
             fileTags: ["dynamiclibrary_symlink"]
         }
 
         // Copy of dynamic lib for smart re-linking.
         Artifact {
             fileName: product.destinationDirectory + "/.socopy/"
-                      + PathTools.dynamicLibraryFilePath()
+                      + PathTools.dynamicLibraryFilePath(product)
             fileTags: ["dynamiclibrary_copy"]
             alwaysUpdated: false
             cpp.transitiveSOs: {
@@ -225,7 +225,7 @@ CppModule {
         usings: ["dynamiclibrary", "staticlibrary", "frameworkbundle"]
 
         Artifact {
-            fileName: product.destinationDirectory + "/" + PathTools.staticLibraryFilePath()
+            fileName: product.destinationDirectory + "/" + PathTools.staticLibraryFilePath(product)
             fileTags: ["staticlibrary"]
             cpp.staticLibraries: {
                 var result = []
@@ -271,7 +271,7 @@ CppModule {
         usings: ["dynamiclibrary_copy", "staticlibrary", "frameworkbundle"]
 
         Artifact {
-            fileName: product.destinationDirectory + "/" + PathTools.applicationFilePath()
+            fileName: product.destinationDirectory + "/" + PathTools.applicationFilePath(product)
             fileTags: ["application"]
         }
 
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index 60137f4f5..7ee020685 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -114,7 +114,7 @@ CppModule {
         usings: ['staticlibrary', 'dynamiclibrary_import']
         Artifact {
             fileTags: ["application"]
-            fileName: product.destinationDirectory + "/" + PathTools.applicationFilePath()
+            fileName: product.destinationDirectory + "/" + PathTools.applicationFilePath(product)
         }
 
         prepare: {
@@ -135,12 +135,12 @@ CppModule {
 
         Artifact {
             fileTags: ["dynamiclibrary"]
-            fileName: product.destinationDirectory + "/" + PathTools.dynamicLibraryFilePath()
+            fileName: product.destinationDirectory + "/" + PathTools.dynamicLibraryFilePath(product)
         }
 
         Artifact {
             fileTags: ["dynamiclibrary_import"]
-            fileName: product.destinationDirectory + "/" + PathTools.importLibraryFilePath()
+            fileName: product.destinationDirectory + "/" + PathTools.importLibraryFilePath(product)
             alwaysUpdated: false
         }
 
@@ -162,7 +162,7 @@ CppModule {
 
         Artifact {
             fileTags: ["staticlibrary"]
-            fileName: product.destinationDirectory + "/" + PathTools.staticLibraryFilePath()
+            fileName: product.destinationDirectory + "/" + PathTools.staticLibraryFilePath(product)
             cpp.staticLibraries: {
                 var result = []
                 for (var i in inputs.staticlibrary) {