From f6eba42522e045fb2a4b0561932c32f431ae7b84 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 11 May 2021 10:49:31 +0200 Subject: [PATCH] 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 --- qbs/imports/QtcLibrary.qbs | 2 +- qbs/imports/QtcPlugin.qbs | 2 +- src/app/app_version_header.qbs | 2 +- .../syntax-highlighting/syntax-highlighting.qbs | 4 ++-- src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs | 2 +- src/libs/cplusplus/cplusplus.qbs | 2 +- src/libs/sqlite/sqlite.qbs | 2 +- src/plugins/qmldesigner/qmldesignerplugin.qbs | 14 +++++++------- src/shared/json/json.qbs | 2 +- src/shared/proparser/proparser.qbs | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs index 9a3721b3e05..887a79dbb5d 100644 --- a/qbs/imports/QtcLibrary.qbs +++ b/qbs/imports/QtcLibrary.qbs @@ -34,6 +34,6 @@ QtcProduct { Export { Depends { name: "cpp" } - cpp.includePaths: [product.libIncludeBase] + cpp.includePaths: [exportingProduct.libIncludeBase] } } diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index dd8e4300fec..9e5a743e12a 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -56,6 +56,6 @@ QtcProduct { Export { Depends { name: "ExtensionSystem" } Depends { name: "cpp" } - cpp.includePaths: [product.pluginIncludeBase] + cpp.includePaths: [exportingProduct.pluginIncludeBase] } } diff --git a/src/app/app_version_header.qbs b/src/app/app_version_header.qbs index 7d091bba0e5..59cd014df7c 100644 --- a/src/app/app_version_header.qbs +++ b/src/app/app_version_header.qbs @@ -68,6 +68,6 @@ Product { Export { Depends { name: "cpp" } - cpp.includePaths: product.buildDirectory + cpp.includePaths: exportingProduct.buildDirectory } } diff --git a/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs b/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs index f932c1c4c35..2261d97d697 100644 --- a/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs +++ b/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs @@ -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/", ] } } diff --git a/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs b/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs index 9a2d3f96a00..ca39a4864f9 100644 --- a/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs +++ b/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs @@ -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"]) } } diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs index f5a9f6b947d..80c6174ba22 100644 --- a/src/libs/cplusplus/cplusplus.qbs +++ b/src/libs/cplusplus/cplusplus.qbs @@ -126,7 +126,7 @@ Project { Export { cpp.includePaths: [ - product.sourceDirectory + "/../3rdparty" + exportingProduct.sourceDirectory + "/../3rdparty" ] } } diff --git a/src/libs/sqlite/sqlite.qbs b/src/libs/sqlite/sqlite.qbs index f5f0e182ab8..f0c58790006 100644 --- a/src/libs/sqlite/sqlite.qbs +++ b/src/libs/sqlite/sqlite.qbs @@ -8,6 +8,6 @@ QtcLibrary { Export { Depends { name: "cpp" } - cpp.includePaths: product.exportedIncludeDir + cpp.includePaths: exportingProduct.exportedIncludeDir } } diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs index 9f9124691ff..5d9d748f8f9 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.qbs +++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs @@ -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", ]) } diff --git a/src/shared/json/json.qbs b/src/shared/json/json.qbs index df11ab293a7..99726f7d68d 100644 --- a/src/shared/json/json.qbs +++ b/src/shared/json/json.qbs @@ -11,6 +11,6 @@ StaticLibrary { ] Export { Depends { name: "cpp" } - cpp.includePaths: [product.sourceDirectory] + cpp.includePaths: [exportingProduct.sourceDirectory] } } diff --git a/src/shared/proparser/proparser.qbs b/src/shared/proparser/proparser.qbs index dc9de24c366..dd9ce7cc64b 100644 --- a/src/shared/proparser/proparser.qbs +++ b/src/shared/proparser/proparser.qbs @@ -13,6 +13,6 @@ Product { "PROEVALUATOR_CUMULATIVE", "PROEVALUATOR_SETENV", ]) - cpp.includePaths: base.concat([product.sourceDirectory + "/.."]) + cpp.includePaths: base.concat([exportingProduct.sourceDirectory + "/.."]) } }