From 84c57a11858f4cd7680da23e52a350c10c9cbe18 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Thu, 19 Mar 2020 14:40:58 +0100 Subject: Fix crash in operator==(ArtifactProperties, ArtifactProperties) Also, make operator==(SourceArtifactInternal, SourceArtifactInternal) more robust Change-Id: I2eb276621d304c7ac5fa7c78af00db09b0c2e3c4 Reviewed-by: Christian Kandeler --- src/lib/corelib/language/artifactproperties.cpp | 1 + src/lib/corelib/language/language.cpp | 1 + 2 files changed, 2 insertions(+) (limited to 'src/lib/corelib/language') 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; } -- cgit v1.2.3