forked from qt-creator/qt-creator
qbs build: Use exportingProduct in Export items
The use of product in Export items is deprecated and will be removed in one of the next qbs versions. Change-Id: I2644a69012db4a4b4842066784913f4160d3d80a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -34,6 +34,6 @@ QtcProduct {
|
||||
|
||||
Export {
|
||||
Depends { name: "cpp" }
|
||||
cpp.includePaths: [product.libIncludeBase]
|
||||
cpp.includePaths: [exportingProduct.libIncludeBase]
|
||||
}
|
||||
}
|
||||
|
@@ -56,6 +56,6 @@ QtcProduct {
|
||||
Export {
|
||||
Depends { name: "ExtensionSystem" }
|
||||
Depends { name: "cpp" }
|
||||
cpp.includePaths: [product.pluginIncludeBase]
|
||||
cpp.includePaths: [exportingProduct.pluginIncludeBase]
|
||||
}
|
||||
}
|
||||
|
@@ -68,6 +68,6 @@ Product {
|
||||
|
||||
Export {
|
||||
Depends { name: "cpp" }
|
||||
cpp.includePaths: product.buildDirectory
|
||||
cpp.includePaths: exportingProduct.buildDirectory
|
||||
}
|
||||
}
|
||||
|
@@ -55,8 +55,8 @@ Project {
|
||||
Export {
|
||||
Depends { name: "cpp" }
|
||||
cpp.includePaths: [
|
||||
product.sourceDirectory + "/src/lib/",
|
||||
product.sourceDirectory + "/autogenerated/src/lib/",
|
||||
exportingProduct.sourceDirectory + "/src/lib/",
|
||||
exportingProduct.sourceDirectory + "/autogenerated/src/lib/",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
2
src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs
vendored
2
src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs
vendored
@@ -98,7 +98,7 @@ Project {
|
||||
|
||||
Export {
|
||||
Depends { name: "cpp" }
|
||||
cpp.includePaths: [product.sourceDirectory + "/include/"]
|
||||
cpp.includePaths: [exportingProduct.sourceDirectory + "/include/"]
|
||||
cpp.defines: base.concat(["YAML_CPP_DLL"])
|
||||
}
|
||||
}
|
||||
|
@@ -126,7 +126,7 @@ Project {
|
||||
|
||||
Export {
|
||||
cpp.includePaths: [
|
||||
product.sourceDirectory + "/../3rdparty"
|
||||
exportingProduct.sourceDirectory + "/../3rdparty"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
@@ -8,6 +8,6 @@ QtcLibrary {
|
||||
|
||||
Export {
|
||||
Depends { name: "cpp" }
|
||||
cpp.includePaths: product.exportedIncludeDir
|
||||
cpp.includePaths: exportingProduct.exportedIncludeDir
|
||||
}
|
||||
}
|
||||
|
@@ -69,13 +69,13 @@ Project {
|
||||
Export {
|
||||
Depends { name: "QmlJS" }
|
||||
cpp.includePaths: base.concat([
|
||||
product.sourceDirectory,
|
||||
product.sourceDirectory + "/components/componentcore",
|
||||
product.sourceDirectory + "/components/edit3d",
|
||||
product.sourceDirectory + "/components/formeditor",
|
||||
product.sourceDirectory + "/components/integration",
|
||||
product.sourceDirectory + "/designercore",
|
||||
product.sourceDirectory + "/designercore/include",
|
||||
exportingProduct.sourceDirectory,
|
||||
exportingProduct.sourceDirectory + "/components/componentcore",
|
||||
exportingProduct.sourceDirectory + "/components/edit3d",
|
||||
exportingProduct.sourceDirectory + "/components/formeditor",
|
||||
exportingProduct.sourceDirectory + "/components/integration",
|
||||
exportingProduct.sourceDirectory + "/designercore",
|
||||
exportingProduct.sourceDirectory + "/designercore/include",
|
||||
qtc.export_data_base + "/qml/qmlpuppet/interfaces",
|
||||
])
|
||||
}
|
||||
|
@@ -11,6 +11,6 @@ StaticLibrary {
|
||||
]
|
||||
Export {
|
||||
Depends { name: "cpp" }
|
||||
cpp.includePaths: [product.sourceDirectory]
|
||||
cpp.includePaths: [exportingProduct.sourceDirectory]
|
||||
}
|
||||
}
|
||||
|
@@ -13,6 +13,6 @@ Product {
|
||||
"PROEVALUATOR_CUMULATIVE",
|
||||
"PROEVALUATOR_SETENV",
|
||||
])
|
||||
cpp.includePaths: base.concat([product.sourceDirectory + "/.."])
|
||||
cpp.includePaths: base.concat([exportingProduct.sourceDirectory + "/.."])
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user