diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-03-19 14:40:58 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-03-20 12:31:36 +0000 |
| commit | 84c57a11858f4cd7680da23e52a350c10c9cbe18 (patch) | |
| tree | 6425f0f33bb5f01f3691685413e93e208573b2d4 | |
| parent | 133351e2fa135eadf6b3daf7dbefc49f293a5210 (diff) | |
Fix crash in operator==(ArtifactProperties, ArtifactProperties)
Also, make operator==(SourceArtifactInternal, SourceArtifactInternal)
more robust
Change-Id: I2eb276621d304c7ac5fa7c78af00db09b0c2e3c4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/lib/corelib/language/artifactproperties.cpp | 1 | ||||
| -rw-r--r-- | src/lib/corelib/language/language.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/corelib/language/artifactproperties.cpp b/src/lib/corelib/language/artifactproperties.cpp index e5b11f4d7..011e58d88 100644 --- a/src/lib/corelib/language/artifactproperties.cpp +++ b/src/lib/corelib/language/artifactproperties.cpp @@ -64,6 +64,7 @@ bool operator==(const ArtifactProperties &ap1, const ArtifactProperties &ap2) { return ap1.fileTagsFilter() == ap2.fileTagsFilter() && ap1.extraFileTags() == ap2.extraFileTags() + && !ap1.propertyMap() == !ap2.propertyMap() && *ap1.propertyMap() == *ap2.propertyMap(); } diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp index 7eec99947..3b3e7401e 100644 --- a/src/lib/corelib/language/language.cpp +++ b/src/lib/corelib/language/language.cpp @@ -857,6 +857,7 @@ bool operator==(const SourceArtifactInternal &sa1, const SourceArtifactInternal && sa1.fileTags == sa2.fileTags && sa1.overrideFileTags == sa2.overrideFileTags && sa1.targetOfModule == sa2.targetOfModule + && !sa1.properties == !sa2.properties && *sa1.properties == *sa2.properties; } |