summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2016-11-22 13:20:38 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2016-11-22 13:03:01 +0000
commit0af53ea66afa28c54a176b9ff882686b3fd4d76f (patch)
treee9732a87c5abc7c14e9476fe1bf772912d434c84
parent12a981f0c129556733e64f8ef6f31e8ce3d02ee8 (diff)
qbs build: Don't use relative paths in product parent itemsv4.2.0-rc1
We should be explicit about where we assume the source files to be. The base directory might change in the future. Change-Id: I75d3c0468568929f6e5a5287255540877f485509 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--3rdparty/elfutils/qbs/imports/ElfUtilsBackend.qbs5
1 files changed, 3 insertions, 2 deletions
diff --git a/3rdparty/elfutils/qbs/imports/ElfUtilsBackend.qbs b/3rdparty/elfutils/qbs/imports/ElfUtilsBackend.qbs
index 56385c7..4b2a434 100644
--- a/3rdparty/elfutils/qbs/imports/ElfUtilsBackend.qbs
+++ b/3rdparty/elfutils/qbs/imports/ElfUtilsBackend.qbs
@@ -13,7 +13,7 @@ ElfUtilsDynamicLib {
cpp.allowUnresolvedSymbols: true
Group {
name: "sources"
- prefix: "../" + arch + "_"
+ prefix: FileInfo.joinPaths(product.sourceDirectory, "..") + '/' + arch + "_"
files: [
"init.c",
"retval.c",
@@ -22,9 +22,10 @@ ElfUtilsDynamicLib {
}
Group {
name: "headers"
+ prefix: FileInfo.joinPaths(product.sourceDirectory, "..") + '/' + arch + "_"
fileTags: ["hpp"]
files: [
- "../" + arch + "_reloc.def"
+ "reloc.def"
]
}
}