Tighten QBS_ASSERTs in EvaluatorScriptClass

Let QueryResult::isNull() (which is only used in QBS_ASSERTs) check all
struct members to make sure we do not encounter old data in
queryProperty/property calls.

Change-Id: I8412e8e8cba7ab38f56c303499384711b78f0623
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 10 insertions, 1 deletions

diff --git a/src/lib/corelib/language/evaluatorscriptclass.h b/src/lib/corelib/language/evaluatorscriptclass.h
index fe0b56215..c6c16cf44 100644
--- a/src/lib/corelib/language/evaluatorscriptclass.h
+++ b/src/lib/corelib/language/evaluatorscriptclass.h
@@ -91,7 +91,16 @@ private:
 
         bool isNull() const
         {
-            return !data;
+            static const QueryResult pristine;
+            return *this == pristine;
+        }
+
+        bool operator==(const QueryResult &rhs) const
+        {
+            return foundInParent == rhs.foundInParent
+                    && data == rhs.data
+                    && itemOfProperty == rhs.itemOfProperty
+                    && value == rhs.value;
         }
 
         bool foundInParent = false;