diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-07-03 12:45:30 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-07-03 14:55:16 +0200 |
| commit | 8a6c03c35c6487c33a25209f29546bfd33c51cfc (patch) | |
| tree | c6cef9f4516095f7f636a918b24c019db6304748 | |
| parent | ea32d49bdad1ca8959c5254f9ad28956c3d9e5f2 (diff) | |
| download | qbs-8a6c03c35c6487c33a25209f29546bfd33c51cfc.tar.gz | |
Make the Loader print progress information also in BuildGraphLoader.
Otherwise, a certain amount of time passes without any progress
information in the case that a project needs to be re-resolved after
restoring.
Change-Id: I15e4e8cdece43a93c6be028c621aba844be5e01c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | src/lib/buildgraph/buildgraphloader.cpp | 1 | ||||
| -rw-r--r-- | src/lib/buildgraph/rulesevaluationcontext.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/buildgraph/buildgraphloader.cpp b/src/lib/buildgraph/buildgraphloader.cpp index 100dc059d..afb0ac090 100644 --- a/src/lib/buildgraph/buildgraphloader.cpp +++ b/src/lib/buildgraph/buildgraphloader.cpp @@ -249,6 +249,7 @@ void BuildGraphLoader::trackProjectChanges(const SetupProjectParameters ¶met Loader ldr(m_evalContext->engine(), m_logger); ldr.setSearchPaths(parameters.searchPaths()); + ldr.setProgressObserver(m_evalContext->observer()); m_result.newlyResolvedProject = ldr.loadProject(parameters); QMap<QString, ResolvedProductPtr> freshProductsByName; diff --git a/src/lib/buildgraph/rulesevaluationcontext.h b/src/lib/buildgraph/rulesevaluationcontext.h index 4898bbbdf..45977bb31 100644 --- a/src/lib/buildgraph/rulesevaluationcontext.h +++ b/src/lib/buildgraph/rulesevaluationcontext.h @@ -62,6 +62,7 @@ public: QScriptValue scope() const { return m_scope; } void setObserver(ProgressObserver *observer) { m_observer = observer; } + ProgressObserver *observer() const { return m_observer; } void initializeObserver(const QString &description, int maximumProgress); void incrementProgressValue(); void checkForCancelation(); |
