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:
Christian Kandeler
2021-05-11 10:49:31 +02:00
parent 2007aceab0
commit f6eba42522
10 changed files with 17 additions and 17 deletions

View File

@@ -34,6 +34,6 @@ QtcProduct {
Export {
Depends { name: "cpp" }
cpp.includePaths: [product.libIncludeBase]
cpp.includePaths: [exportingProduct.libIncludeBase]
}
}

View File

@@ -56,6 +56,6 @@ QtcProduct {
Export {
Depends { name: "ExtensionSystem" }
Depends { name: "cpp" }
cpp.includePaths: [product.pluginIncludeBase]
cpp.includePaths: [exportingProduct.pluginIncludeBase]
}
}

View File

@@ -68,6 +68,6 @@ Product {
Export {
Depends { name: "cpp" }
cpp.includePaths: product.buildDirectory
cpp.includePaths: exportingProduct.buildDirectory
}
}

View File

@@ -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/",
]
}
}

View File

@@ -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"])
}
}

View File

@@ -126,7 +126,7 @@ Project {
Export {
cpp.includePaths: [
product.sourceDirectory + "/../3rdparty"
exportingProduct.sourceDirectory + "/../3rdparty"
]
}
}

View File

@@ -8,6 +8,6 @@ QtcLibrary {
Export {
Depends { name: "cpp" }
cpp.includePaths: product.exportedIncludeDir
cpp.includePaths: exportingProduct.exportedIncludeDir
}
}

View File

@@ -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",
])
}

View File

@@ -11,6 +11,6 @@ StaticLibrary {
]
Export {
Depends { name: "cpp" }
cpp.includePaths: [product.sourceDirectory]
cpp.includePaths: [exportingProduct.sourceDirectory]
}
}

View File

@@ -13,6 +13,6 @@ Product {
"PROEVALUATOR_CUMULATIVE",
"PROEVALUATOR_SETENV",
])
cpp.includePaths: base.concat([product.sourceDirectory + "/.."])
cpp.includePaths: base.concat([exportingProduct.sourceDirectory + "/.."])
}
}