diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-16 00:41:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-16 00:41:49 (GMT) |
| commit | 5e97373e3c9da3eed2e4f11be4cb1d57a0536668 (patch) | |
| tree | be8c8d896ca3d66eaae97e09e4ba7af70db7e26f /src | |
| parent | ab31c1a482630007eccd532b49e03f0345421aa8 (diff) | |
| parent | 42bceb1f394e462a43615286b008e31025c8f0f0 (diff) | |
| download | Qt-5e97373e3c9da3eed2e4f11be4cb1d57a0536668.zip Qt-5e97373e3c9da3eed2e4f11be4cb1d57a0536668.tar.gz Qt-5e97373e3c9da3eed2e4f11be4cb1d57a0536668.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:
doc: Fixed a \overload
Diffstat (limited to 'src')
| -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) { |