aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/corelib/language/moduleloader.cpp4
-rw-r--r--tests/auto/blackbox/testdata/exportSimple/project.qbs4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index e6c911d6e..ba11840ad 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -443,12 +443,15 @@ void ModuleLoader::mergeExportItems(ModuleLoader::ProductContext *productContext
{
Item *merged = Item::create(productContext->item->pool());
merged->setTypeName(QLatin1String("Export"));
+ merged->setFile(productContext->item->file());
+ merged->setLocation(productContext->item->location());
QSet<Item *> exportItems;
foreach (Item *exportItem, productContext->exportItems) {
checkCancelation();
if (Q_UNLIKELY(productContext->filesWithExportItem.contains(exportItem->file())))
throw ErrorInfo(Tr::tr("Multiple Export items in one product are prohibited."),
exportItem->location());
+ merged->setFile(exportItem->file());
merged->setLocation(exportItem->location());
productContext->filesWithExportItem += exportItem->file();
exportItems.insert(exportItem);
@@ -861,6 +864,7 @@ void ModuleLoader::instantiateModule(ProductContext *productContext, Item *insta
// create module scope
Item *moduleScope = Item::create(m_pool);
+ QBS_CHECK(instanceScope->file());
moduleScope->setFile(instanceScope->file());
moduleScope->setScope(instanceScope);
copyProperty(QLatin1String("project"), productContext->project->scope, moduleScope);
diff --git a/tests/auto/blackbox/testdata/exportSimple/project.qbs b/tests/auto/blackbox/testdata/exportSimple/project.qbs
index 1b665b880..96244671a 100644
--- a/tests/auto/blackbox/testdata/exportSimple/project.qbs
+++ b/tests/auto/blackbox/testdata/exportSimple/project.qbs
@@ -19,6 +19,10 @@ Project {
}
Export {
Depends { name: 'dummy2' }
+ Properties { // QBS-550
+ condition: false
+ qbs.optimization: "ludicrous speed"
+ }
}
}