feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qbs build: Use exportingProduct in Export items

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
qbs/imports/QtcLibrary.qbs
View File

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

2
qbs/imports/QtcPlugin.qbs
View File

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

2
src/app/app_version_header.qbs
View File

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

4
src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs vendored
View File

@@ -55,8 +55,8 @@ Project {
Export { Export {
Depends { name: "cpp" } Depends { name: "cpp" }
cpp.includePaths: [ cpp.includePaths: [
product.sourceDirectory + "/src/lib/", exportingProduct.sourceDirectory + "/src/lib/",
product.sourceDirectory + "/autogenerated/src/lib/", exportingProduct.sourceDirectory + "/autogenerated/src/lib/",
] ]
} }
} }

2
src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs vendored
View File

@@ -98,7 +98,7 @@ Project {
Export { Export {
Depends { name: "cpp" } Depends { name: "cpp" }
cpp.includePaths: [product.sourceDirectory + "/include/"] cpp.includePaths: [exportingProduct.sourceDirectory + "/include/"]
cpp.defines: base.concat(["YAML_CPP_DLL"]) cpp.defines: base.concat(["YAML_CPP_DLL"])
} }
} }

2
src/libs/cplusplus/cplusplus.qbs
View File

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

2
src/libs/sqlite/sqlite.qbs
View File

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

14
src/plugins/qmldesigner/qmldesignerplugin.qbs
View File

@@ -69,13 +69,13 @@ Project {
Export { Export {
Depends { name: "QmlJS" } Depends { name: "QmlJS" }
cpp.includePaths: base.concat([ cpp.includePaths: base.concat([
product.sourceDirectory, exportingProduct.sourceDirectory,
product.sourceDirectory + "/components/componentcore", exportingProduct.sourceDirectory + "/components/componentcore",
product.sourceDirectory + "/components/edit3d", exportingProduct.sourceDirectory + "/components/edit3d",
product.sourceDirectory + "/components/formeditor", exportingProduct.sourceDirectory + "/components/formeditor",
product.sourceDirectory + "/components/integration", exportingProduct.sourceDirectory + "/components/integration",
product.sourceDirectory + "/designercore", exportingProduct.sourceDirectory + "/designercore",
product.sourceDirectory + "/designercore/include", exportingProduct.sourceDirectory + "/designercore/include",
qtc.export_data_base + "/qml/qmlpuppet/interfaces", qtc.export_data_base + "/qml/qmlpuppet/interfaces",
]) ])
} }

2
src/shared/json/json.qbs
View File

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

2
src/shared/proparser/proparser.qbs
View File

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