diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-06 00:12:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-06 00:12:05 (GMT) |
| commit | 9abc55f373d11d9b329f164f6894812b94af7bce (patch) | |
| tree | 4d80b7c49c647ec52d43538859209247c0c57870 /src/corelib | |
| parent | 941b13d52d975069d10093a873cd3a55bb2fd7dd (diff) | |
| parent | e855b199319c932f2e9500235775f961bc32e41a (diff) | |
| download | Qt-9abc55f373d11d9b329f164f6894812b94af7bce.zip Qt-9abc55f373d11d9b329f164f6894812b94af7bce.tar.gz Qt-9abc55f373d11d9b329f164f6894812b94af7bce.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:
Fixes scrolling horizontally with a mouse wheel over sliders.
Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
A fix for accidently reused variable names in nested iterations.
Iain's changes for 4.6.2
Doc: Fixed typo.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 698ca9e..b63a82e 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -958,8 +958,8 @@ QTextCodec *QTextCodec::codecForName(const QByteArray &name) if (nameMatch(cursor->name(), name)) return cursor; QList<QByteArray> aliases = cursor->aliases(); - for (int i = 0; i < aliases.size(); ++i) - if (nameMatch(aliases.at(i), name)) + for (int y = 0; y < aliases.size(); ++y) + if (nameMatch(aliases.at(y), name)) return cursor; } |