forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -46,6 +46,6 @@ QtcProduct {
|
|||||||
Export {
|
Export {
|
||||||
Depends { name: "cpp" }
|
Depends { name: "cpp" }
|
||||||
Depends { name: "ExtensionSystem" }
|
Depends { name: "ExtensionSystem" }
|
||||||
cpp.includePaths: ".."
|
cpp.includePaths: exportingProduct.sourceDirectory + "/.."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
2
src/libs/3rdparty/libvterm/vterm.qbs
vendored
2
src/libs/3rdparty/libvterm/vterm.qbs
vendored
@@ -30,6 +30,6 @@ QtcLibrary {
|
|||||||
|
|
||||||
Export {
|
Export {
|
||||||
Depends { name: "cpp" }
|
Depends { name: "cpp" }
|
||||||
cpp.includePaths: "include"
|
cpp.includePaths: exportingProduct.sourceDirectory + "/include"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -396,8 +396,8 @@ QtcLibrary {
|
|||||||
|
|
||||||
Export {
|
Export {
|
||||||
cpp.includePaths: [
|
cpp.includePaths: [
|
||||||
".",
|
exportingProduct.sourceDirectory,
|
||||||
"./qtserialization/inc"
|
exportingProduct.sourceDirectory + "/qtserialization/inc"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -14,7 +14,7 @@ QtcLibrary {
|
|||||||
|
|
||||||
Export {
|
Export {
|
||||||
Depends { name: "cpp" }
|
Depends { name: "cpp" }
|
||||||
cpp.includePaths: ".."
|
cpp.includePaths: exportingProduct.sourceDirectory + "/.."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -22,7 +22,10 @@ QtcLibrary {
|
|||||||
|
|
||||||
Export {
|
Export {
|
||||||
Depends { name: "cpp" }
|
Depends { name: "cpp" }
|
||||||
cpp.includePaths: ["..", "../.."]
|
cpp.includePaths: [
|
||||||
|
exportingProduct.sourceDirectory + "/..",
|
||||||
|
exportingProduct.sourceDirectory + "/../.."
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -475,6 +475,6 @@ QtcLibrary {
|
|||||||
Export {
|
Export {
|
||||||
Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
|
Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
|
||||||
Depends { name: "Tasking" }
|
Depends { name: "Tasking" }
|
||||||
cpp.includePaths: "mimetypes2"
|
cpp.includePaths: exportingProduct.sourceDirectory + "/mimetypes2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user