summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Roquetto <rafael.roquetto.qnx@kdab.com>2012-07-24 13:45:44 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-07-25 16:46:24 (GMT)
commite0bcf88ffd02a504bf3398dae1a667ec101afee6 (patch)
tree23c44bd79b207988410802a74817cb582607b0c8
parent89c8b1908ccaf13e6722bb7f2344f46fe6ba7e15 (diff)
downloadQt-e0bcf88ffd02a504bf3398dae1a667ec101afee6.zip
Qt-e0bcf88ffd02a504bf3398dae1a667ec101afee6.tar.gz
Qt-e0bcf88ffd02a504bf3398dae1a667ec101afee6.tar.bz2
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 <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r--qmake/cachekeys.h4
-rw-r--r--qmake/generators/makefile.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/qmake/cachekeys.h b/qmake/cachekeys.h
index 64d068a..11f5fbf 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 1e82e78..9ff75c8 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;
}
};