diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-13 11:58:08 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-13 11:58:08 (GMT) |
| commit | 0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9 (patch) | |
| tree | 046ad0fdf693107efb75a0ecd03f6cbc3dd00680 /src/corelib | |
| parent | c2c69c117407990e5c2d8900f4aa27979273084a (diff) | |
| parent | a18ebd2a70e83863bc9a8cc64a65791a6d879f02 (diff) | |
| download | Qt-0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9.zip Qt-0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9.tar.gz Qt-0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9.tar.bz2 | |
Merge branch '4.5'
Conflicts:
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qhash.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index b2512e1..2313e0e 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -380,9 +380,9 @@ void QHashData::checkSanity() /*! \fn uint qHash(const QPair<T1, T2> &key) - \relates QHash \since 4.3 - + \relates QHash + Returns the hash value for the \a key. Types \c T1 and \c T2 must be supported by qHash(). @@ -502,7 +502,8 @@ void QHashData::checkSanity() key. With QHash, the items are arbitrarily ordered. \i The key type of a QMap must provide operator<(). The key type of a QHash must provide operator==() and a global - \l{qHash()} {hash} function. + hash function called qHash() (see the related non-member + functions). \endlist Here's an example QHash with QString keys and \c int values: |