diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-09 15:55:07 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-05-12 16:55:30 +0200 |
commit | 33f0e83c0cd2c2f149f2b03ac7cb4ba9dd22fb1a (patch) | |
tree | 20d071857dbd70bf226831420735afdb14a508a7 /src/lib/corelib/language/projectresolver.cpp | |
parent | 44fb1b39f48ba0c700e4ec90e84421eaf886c702 (diff) |
make product.sourceDirectory available in Probe item
Task-number: QBS-393
Change-Id: I33c588fd0c00231db2ca4fa4f9b70a5b1f5bc18f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/language/projectresolver.cpp')
-rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 7c532dee0..178e8e46d 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -274,9 +274,6 @@ void ProjectResolver::resolveProduct(Item *item, ProjectContext *projectContext) ProductContext productContext; m_productContext = &productContext; productContext.item = item; - const QString productSourceDirectory = QFileInfo(item->file()->filePath()).absolutePath(); - item->setProperty(QLatin1String("sourceDirectory"), - VariantValue::create(productSourceDirectory)); item->setProperty(QLatin1String("buildDirectory"), VariantValue::create(projectContext ->project->topLevelProject()->buildDirectory)); ResolvedProductPtr product = ResolvedProduct::create(); @@ -314,7 +311,7 @@ void ProjectResolver::resolveProduct(Item *item, ProjectContext *projectContext) product->fileTags = m_evaluator->fileTagsValue(item, QLatin1String("type")); product->targetName = m_evaluator->stringValue(item, QLatin1String("targetName")); - product->sourceDirectory = productSourceDirectory; + product->sourceDirectory = m_evaluator->stringValue(item, QLatin1String("sourceDirectory")); product->destinationDirectory = m_evaluator->stringValue(item, QLatin1String("destinationDirectory")); product->location = item->location(); |