Fix qmake hash function to use XOR

Use XOR instead of OR in order to avoid saturating all bits when computing the hash value. Change-Id: I50b1a044eb827239dae1c04732ca6a065f6233b4 Reviewed-by: Andreas Holzammer <[email protected]> Reviewed-by: Oswald Buddenhagen <[email protected]>
andreasbuhr · Jul 25, 2012 · 3a27d4b · 3a27d4b
1 parent 4677cf3
commit 3a27d4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/qmake/cachekeys.h b/qmake/cachekeys.h
@@ -73,7 +73,7 @@ struct FixStringCacheKey
     }
     inline uint hashCode() const {
         if(!hash)
-            hash = qHash(string) | qHash(flags) /*| qHash(pwd)*/;
+            hash = qHash(string) ^ qHash(flags) /*^ qHash(pwd)*/;
         return hash;
     }
 };
@@ -98,7 +98,7 @@ struct FileInfoCacheKey
     }
     inline uint hashCode() const {
         if(!hash)
-            hash = qHash(file) /*| qHash(pwd)*/;
+            hash = qHash(file) /*^ qHash(pwd)*/;
         return hash;
     }
     inline bool isRelativePath(const QString &file) {

diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
@@ -68,7 +68,7 @@ struct ReplaceExtraCompilerCacheKey
     bool operator==(const ReplaceExtraCompilerCacheKey &f) const;
     inline uint hashCode() const {
         if(!hash)
-            hash = qHash(var) | qHash(in) | qHash(out) /*| qHash(pwd)*/;
+            hash = qHash(var) ^ qHash(in) ^ qHash(out) /*^ qHash(pwd)*/;
         return hash;
     }
 };