make product.buildDirectory available in Probe item

As a consequence product.name is evaluated very early and cannot depend
on module properties and such. Autotests that used product.name as
verification script had to be adjusted accordingly.

Task-number: QBS-393
Change-Id: I62ae1a92313af54d9eb15e88b7457388584f7556
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h
index c368dbf40..5df1747fc 100644
--- a/src/lib/corelib/language/moduleloader.h
+++ b/src/lib/corelib/language/moduleloader.h
@@ -123,6 +123,7 @@ private:
     {
     public:
         ModuleLoaderResult *result;
+        QString buildDirectory;
         QString localModuleSearchPath;
     };
 
@@ -145,9 +146,10 @@ private:
     typedef QPair<Item *, ModuleLoaderResult::ProductInfo::Dependency> ProductDependencyResult;
     typedef QList<ProductDependencyResult> ProductDependencyResults;
 
-    void handleProject(ModuleLoaderResult *loadResult, Item *item,
+    void handleProject(ModuleLoaderResult *loadResult, Item *item, const QString &buildDirectory,
             const QSet<QString> &referencedFilePaths);
     void handleProduct(ProjectContext *projectContext, Item *item);
+    void initProductProperties(const ProjectContext *project, Item *item);
     void handleSubProject(ProjectContext *projectContext, Item *item,
             const QSet<QString> &referencedFilePaths);
     void createAdditionalModuleInstancesInProduct(ProductContext *productContext);