diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-16 12:55:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-16 12:55:04 (GMT) |
| commit | 29a06cd2791583e086094ca88c261d19586bc680 (patch) | |
| tree | 64d8a58aadc202e2398dcb0eb54b6f318cc2bce0 /src/corelib | |
| parent | b6e8943592ec6b2cbc619c35ca90feded0e1e87b (diff) | |
| parent | d31b4c4853117d138dbdf1921c07c577850314fd (diff) | |
| download | Qt-29a06cd2791583e086094ca88c261d19586bc680.zip Qt-29a06cd2791583e086094ca88c261d19586bc680.tar.gz Qt-29a06cd2791583e086094ca88c261d19586bc680.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Update add libconninet version 0.45.
Remove libconninet in preperation to updating it to version 0.45.
doc: Fixed a \overload
Diffstat (limited to 'src/corelib')
| -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..043d6a3 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 addData() */ void QCryptographicHash::addData(const QByteArray &data) { |