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/buildgraph/executor.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/buildgraph/executor.h')
| -rw-r--r-- | src/lib/buildgraph/executor.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/buildgraph/executor.h b/src/lib/buildgraph/executor.h index 634ae249a..4638b7928 100644 --- a/src/lib/buildgraph/executor.h +++ b/src/lib/buildgraph/executor.h @@ -40,7 +40,6 @@ #include <tools/error.h> #include <QObject> -#include <QProcessEnvironment> namespace qbs { class ProcessResult; @@ -67,7 +66,6 @@ public: void setProducts(const QList<ResolvedProductPtr> &productsToBuild); void setBuildOptions(const BuildOptions &buildOptions); void setProgressObserver(ProgressObserver *observer) { m_progressObserver = observer; } - void setBaseEnvironment(const QProcessEnvironment &env) { m_baseEnvironment = env; } Error error() const { return m_error; } bool hasError() const { return !error().entries().isEmpty(); } @@ -119,7 +117,6 @@ private: BuildOptions m_buildOptions; Logger m_logger; ProgressObserver *m_progressObserver; - QProcessEnvironment m_baseEnvironment; QList<ExecutorJob*> m_availableJobs; QHash<ExecutorJob*, Artifact *> m_processingJobs; ExecutorState m_state; |