diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-01-22 14:51:06 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-01-22 14:53:53 +0100 |
commit | fb5632e3930cbb5d93296d2df31ea0c369b3de41 (patch) | |
tree | 7eaa46d6e3f4e1e5abc95408eb23d7f6909bc5cb /src/lib/corelib/api | |
parent | 888c80bb43817f8fdb829d8684c381c18700b63f (diff) | |
parent | a762572ec1cba9e96156edf281cfebbad256bfba (diff) |
Merge remote-tracking branch 'origin/1.1'
Change-Id: I2c4aa7cb7ec7db58577ceac5cb56bc925ae9360f
Diffstat (limited to 'src/lib/corelib/api')
-rw-r--r-- | src/lib/corelib/api/internaljobs.cpp | 4 | ||||
-rw-r--r-- | src/lib/corelib/api/internaljobs.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/corelib/api/internaljobs.cpp b/src/lib/corelib/api/internaljobs.cpp index a28bee72e..b8e4bdef9 100644 --- a/src/lib/corelib/api/internaljobs.cpp +++ b/src/lib/corelib/api/internaljobs.cpp @@ -31,6 +31,7 @@ #include "jobs.h" #include <buildgraph/artifactcleaner.h> +#include <buildgraph/buildgraph.h> #include <buildgraph/buildgraphloader.h> #include <buildgraph/productbuilddata.h> #include <buildgraph/projectbuilddata.h> @@ -138,9 +139,10 @@ void InternalJob::shareObserverWith(InternalJob *otherJob) m_observer = otherJob->m_observer; } -void InternalJob::storeBuildGraph(const TopLevelProjectConstPtr &project) +void InternalJob::storeBuildGraph(const TopLevelProjectPtr &project) { try { + doSanityChecks(project, logger()); project->store(logger()); } catch (const ErrorInfo &error) { logger().printWarning(error); diff --git a/src/lib/corelib/api/internaljobs.h b/src/lib/corelib/api/internaljobs.h index ef112662f..dfb594e54 100644 --- a/src/lib/corelib/api/internaljobs.h +++ b/src/lib/corelib/api/internaljobs.h @@ -72,7 +72,7 @@ protected: JobObserver *observer() const { return m_observer; } void setTimed(bool timed) { m_timed = timed; } - void storeBuildGraph(const TopLevelProjectConstPtr &project); + void storeBuildGraph(const TopLevelProjectPtr &project); signals: void finished(Internal::InternalJob *job); |