From e0bcf88ffd02a504bf3398dae1a667ec101afee6 Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Tue, 24 Jul 2012 15:45:44 +0200 Subject: Fix qmake hash function to use XOR Use XOR instead of OR in order to avoid saturating all bits when computing the hash value. cherry-picked from qt5/qtbase: 3a27d4b480214072d972ac67561f2ee4010f8baa Change-Id: I582e5b3c42d6436395555a54c6826509d6243ed4 Reviewed-by: Andreas Holzammer Reviewed-by: Oswald Buddenhagen --- qmake/cachekeys.h | 4 ++-- qmake/generators/makefile.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'qmake') diff --git a/qmake/cachekeys.h b/qmake/cachekeys.h index 64d068a6e6..11f5fbf8d2 100644 --- 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 index 1e82e786d0..9ff75c8b42 100644 --- 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; } }; -- cgit v1.2.3