summaryrefslogtreecommitdiff
path: root/src/lib/language/projectresolver.h
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2013-09-18 16:09:26 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2013-09-19 11:38:41 +0200
commit2c442b7b7e7a80522743f4b2931f615e1fc9beb5 (patch)
tree1662968fbe55d2d6f8d834148bde6c42f60e1bc9 /src/lib/language/projectresolver.h
parentef518a67368911f4a862387771c37da900792b29 (diff)
downloadqbs-2c442b7b7e7a80522743f4b2931f615e1fc9beb5.tar.gz
fix imports/extensions for script properties
Import directives in files of imported items were ignored for prepare scripts. We must use the file context (that contains the imports) of the file where the script property is set. Change-Id: Icca3fc84dd1e130446775122b7b58e6e9ddced98 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/language/projectresolver.h')
-rw-r--r--src/lib/language/projectresolver.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/language/projectresolver.h b/src/lib/language/projectresolver.h
index c5213b80a..b57a5a57e 100644
--- a/src/lib/language/projectresolver.h
+++ b/src/lib/language/projectresolver.h
@@ -85,6 +85,7 @@ private:
QString verbatimValue(const ValueConstPtr &value) const;
QString verbatimValue(Item *item, const QString &name) const;
ScriptFunctionPtr scriptFunctionValue(Item *item, const QString &name) const;
+ ResolvedFileContextPtr resolvedFileContext(const FileContextConstPtr &ctx) const;
void ignoreItem(Item *item, ProjectContext *projectContext);
void resolveTopLevelProject(Item *item, ProjectContext *projectContext);
void resolveProject(Item *item, ProjectContext *projectContext);
@@ -127,6 +128,7 @@ private:
ModuleContext *m_moduleContext;
QMap<QString, ResolvedProductPtr> m_productsByName;
QHash<ResolvedProductPtr, Item *> m_productItemMap;
+ mutable QHash<FileContextConstPtr, ResolvedFileContextPtr> m_fileContextMap;
QMap<QString, QVariantMap> m_exports;
typedef void (ProjectResolver::*ItemFuncPtr)(Item *item, ProjectContext *projectContext);