diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2013-06-05 16:48:02 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-06-06 16:41:48 +0200 |
| commit | 3efc5eff61ab8b5479ac01e9bef2120bb9d687fe (patch) | |
| tree | 8cb3c5f77df08e40f2de61eda4ad1f69b06d5d5d /src/lib/language/projectresolver.h | |
| parent | 9dcb3b83cfb69a17d98df9bcac9089671d3c1086 (diff) | |
| download | qbs-3efc5eff61ab8b5479ac01e9bef2120bb9d687fe.tar.gz | |
Pass the environment to be used as part of the setupprojectparameters
Pass in the environment to be used when resolving a project via
the SetupProjectParameters.
Store this environment and use it when building. Remove APIs for passing
an environment when building.
Change-Id: Icfd345bac27999b3e4191061a31d9df4f24cbd7f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/language/projectresolver.h')
| -rw-r--r-- | src/lib/language/projectresolver.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/language/projectresolver.h b/src/lib/language/projectresolver.h index 890a47bc6..bf4350ceb 100644 --- a/src/lib/language/projectresolver.h +++ b/src/lib/language/projectresolver.h @@ -56,7 +56,9 @@ public: ~ProjectResolver(); void setProgressObserver(ProgressObserver *observer); - ResolvedProjectPtr resolve(ModuleLoaderResult &loadResult, const QString &buildRoot, const QVariantMap &buildConfiguration); + ResolvedProjectPtr resolve(ModuleLoaderResult &loadResult, const QString &buildRoot, + const QVariantMap &buildConfiguration, + const QProcessEnvironment &environment); private: struct ProjectContext @@ -126,6 +128,7 @@ private: ProductContext *m_productContext; ModuleContext *m_moduleContext; QSet<QString> m_groupPropertyDeclarations; + QProcessEnvironment m_environment; typedef void (ProjectResolver::*ItemFuncPtr)(Item *item); typedef QMap<QByteArray, ItemFuncPtr> ItemFuncMap; |