diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-10 22:00:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-10 22:00:56 (GMT) |
| commit | f4a7f53b3ccf72e336c598286422b18ca960cf57 (patch) | |
| tree | 7bf66bc4f7dcf0090057766410d462f737d7c01d | |
| parent | 79f20ff18232f5b9a8df061a74b08948dadb7b8b (diff) | |
| parent | 7702bd86f2c0a9b2dc1ddcd745445f8c3fd2602f (diff) | |
| download | Qt-f4a7f53b3ccf72e336c598286422b18ca960cf57.zip Qt-f4a7f53b3ccf72e336c598286422b18ca960cf57.tar.gz Qt-f4a7f53b3ccf72e336c598286422b18ca960cf57.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: Fixed qdoc warning.
| -rw-r--r-- | src/corelib/tools/qcryptographichash.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp index f418de9..8b1464f 100644 --- a/src/corelib/tools/qcryptographichash.cpp +++ b/src/corelib/tools/qcryptographichash.cpp @@ -147,7 +147,7 @@ void QCryptographicHash::addData(const char *data, int length) } /*! - /overload + \overload */ void QCryptographicHash::addData(const QByteArray &data) { |