diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-04-09 13:45:48 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-04-10 11:54:17 +0200 |
| commit | 3bdd2e95d35a2ae1b5223596e95bc0146e6c0fbf (patch) | |
| tree | d509880accd3146bf9cc9b872e695b4b1fd3758a | |
| parent | de25f2fcbf334e60ae2b6e922833e540480cd472 (diff) | |
| download | qbs-3bdd2e95d35a2ae1b5223596e95bc0146e6c0fbf.tar.gz | |
expose project scope in referenced products
Change-Id: Ic67e930d9d5dc531c18ef3a82d80b31e1916ba8d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | src/lib/language/moduleloader.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/language/moduleloader.cpp b/src/lib/language/moduleloader.cpp index dfccdae63..5516587e4 100644 --- a/src/lib/language/moduleloader.cpp +++ b/src/lib/language/moduleloader.cpp @@ -137,6 +137,7 @@ void ModuleLoader::handleProject(ModuleLoaderResult *loadResult, const ItemPtr & ItemPtr subprj = m_reader->readFile(absReferencePath); if (subprj->typeName() != "Product") throw Error("TODO: implement project refs"); + subprj->setScope(projectContext.scope); subprj->setParent(projectContext.item); QList<ItemPtr> projectChildren = projectContext.item->children(); projectChildren += subprj; diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 40aa2c8af..540d20ae6 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -758,7 +758,6 @@ void TestBlackbox::missingQObjectHeader() void TestBlackbox::productProperties() { QDir::setCurrent(testDataDir + "/productproperties"); - QEXPECT_FAIL("", "FIXME: project property not known in referenced products", Abort); QCOMPARE(runQbs(QStringList() << QLatin1String("-f") << QLatin1String("project.qbs"), true), 0); QVERIFY(QFile::exists(buildDir + HostOsInfo::appendExecutableSuffix("/blubb_user"))); } |