diff options
| author | Denis Klychkov <kd.snake@gmail.com> | 2016-11-16 14:39:07 +0300 |
|---|---|---|
| committer | Denis Klychkov <kd.snake@gmail.com> | 2016-12-19 11:49:27 +0000 |
| commit | d3b1bf682181277e03299b1567631e144df12a67 (patch) | |
| tree | eede04b22ecdf0f7493c79e1193eba3e03dc9780 /src/lib/corelib/buildgraph/buildgraphloader.h | |
| parent | b7bbe9ee67969342550985ad983fff8fd994ae47 (diff) | |
Allow Probe items inside Project items
As long as projects do not have unique names it required to change
identification of the restored probes. They used product id before.
Now they use combination of item id and file path.
This also led to a requirement of non-empty id for all probes.
Anyway probes are very rarely used without an id.
Task-number: QBS-1034
Change-Id: Ibe462a3c0abfd9925f441d722b19cea1bcde3ee2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/buildgraph/buildgraphloader.h')
| -rw-r--r-- | src/lib/corelib/buildgraph/buildgraphloader.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.h b/src/lib/corelib/buildgraph/buildgraphloader.h index 6ec918e14..47525f042 100644 --- a/src/lib/corelib/buildgraph/buildgraphloader.h +++ b/src/lib/corelib/buildgraph/buildgraphloader.h @@ -82,7 +82,8 @@ private: void loadBuildGraphFromDisk(); void checkBuildGraphCompatibility(const TopLevelProjectConstPtr &project); void trackProjectChanges(); - bool probeExecutionForced(const QList<ResolvedProductPtr> &restoredProducts) const; + bool probeExecutionForced(const TopLevelProjectConstPtr &restoredProject, + const QList<ResolvedProductPtr> &restoredProducts) const; bool hasEnvironmentChanged(const TopLevelProjectConstPtr &restoredProject) const; bool hasCanonicalFilePathResultChanged(const TopLevelProjectConstPtr &restoredProject) const; bool hasFileExistsResultChanged(const TopLevelProjectConstPtr &restoredProject) const; |