diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-08 19:04:38 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-08 19:05:16 +0200 |
commit | c14e9d3d56a5fe5820077fde28289e6f2f484026 (patch) | |
tree | fa4fdafe6ee9e372a6a79a1bc2cd96384f93c0ac /src/lib/corelib/language | |
parent | 9a1f3ab94c64c24a0b4954f4e50bccdb7ba314fc (diff) | |
parent | d203f9b8203dedd08e3588af0c64e1d16e130bf8 (diff) |
Merge remote-tracking branch 'origin/1.2'
Change-Id: I4a1b580c51119b1a740e86a289d867e6f3102a39
Diffstat (limited to 'src/lib/corelib/language')
-rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 6f44082de..00086ae21 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); @@ -860,6 +863,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); |