diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/corelib/corelib.qbs | 2 | ||||
| -rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 7 | ||||
| -rw-r--r-- | src/lib/scriptengine/scriptengine.qbs | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index 6a5b33f98..40a4bc44f 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -530,6 +530,6 @@ QbsLibrary { } Export { Depends { name: "cpp" } - cpp.defines: base.concat(product.projectFileUpdateDefines) + cpp.defines: base.concat(exportingProduct.projectFileUpdateDefines) } } diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index f65421a35..c66c5cb90 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -3470,10 +3470,11 @@ void ModuleLoader::instantiateModule(ProductContext *productContext, Item *expor if (exportingProduct) { const auto exportingProductItemValue = ItemValue::create(exportingProduct); moduleScope->setProperty(QStringLiteral("exportingProduct"), exportingProductItemValue); - moduleScope->setProperty(QStringLiteral("importingProduct"), - ItemValue::create(productContext->item)); - // TODO: Remove in 1.20. + const auto importingProductItemValue = ItemValue::create(productContext->item); + moduleScope->setProperty(QStringLiteral("importingProduct"), importingProductItemValue); + + // TODO: Remove in 1.21. moduleScope->setProperty(StringConstants::productVar(), exportingProductItemValue); moduleScope->setProperty(StringConstants::projectVar(), diff --git a/src/lib/scriptengine/scriptengine.qbs b/src/lib/scriptengine/scriptengine.qbs index 3225ceaac..c7061fa98 100644 --- a/src/lib/scriptengine/scriptengine.qbs +++ b/src/lib/scriptengine/scriptengine.qbs @@ -368,7 +368,7 @@ Project { Export { Depends { name: "QtScriptFwdHeaders" } Depends { name: "cpp" } - property stringList includePaths: [product.sourceDirectory + "/include"] + property stringList includePaths: [exportingProduct.sourceDirectory + "/include"] .concat(QtScriptFwdHeaders.publicIncludePaths) Properties { condition: qbs.targetOS.contains("unix") @@ -441,10 +441,10 @@ Project { Export { Depends { name: "Qt.core" } property stringList publicIncludePaths: [ - FileInfo.joinPaths(product.buildDirectory, "include") + FileInfo.joinPaths(exportingProduct.buildDirectory, "include") ] property stringList privateIncludePaths: [ - FileInfo.joinPaths(product.buildDirectory, "include", + FileInfo.joinPaths(exportingProduct.buildDirectory, "include", "QtScript", Qt.core.version, "QtScript") ] } |