diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-05-20 16:41:05 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-05-20 16:41:05 (GMT) |
| commit | f9d26f0bebd5bcc32d15c4a627251c44cf78389e (patch) | |
| tree | 64a13ad1e625f35811286d8d468fe9f504a29df8 /src/corelib | |
| parent | 64fb80c40cb0fd978923d1931670ba70466bc76e (diff) | |
| parent | 56a8e78869325453010fb6c41a5e2b9e6f8f1c95 (diff) | |
| download | Qt-f9d26f0bebd5bcc32d15c4a627251c44cf78389e.zip Qt-f9d26f0bebd5bcc32d15c4a627251c44cf78389e.tar.gz Qt-f9d26f0bebd5bcc32d15c4a627251c44cf78389e.tar.bz2 | |
Merge commit 'origin/4.5'
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qhash.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index a18b531..632c422 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -97,10 +97,7 @@ Q_CORE_EXPORT uint qHash(const QBitArray &key); #endif template <class T> inline uint qHash(const T *key) { - if (sizeof(const T *) > sizeof(uint)) - return qHash(reinterpret_cast<quint64>(key)); - else - return uint(reinterpret_cast<ulong>(key)); + return qHash(reinterpret_cast<quintptr>(key)); } #if defined(Q_CC_MSVC) #pragma warning( pop ) |