diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-11 13:08:00 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-11 13:08:00 (GMT) |
commit | d826789946cc471b10f02cac1c9a01b055ff8573 (patch) | |
tree | 31c23b3bd55c3201771d62637923b7a73257c876 /src/corelib/tools/qbytearraymatcher.cpp | |
parent | 8c144f94ee8c391c5ca9ba4c8de93dc5566cbf57 (diff) | |
parent | d04210c1f5f7a497b2640f223ede67bf5f2860c6 (diff) | |
download | Qt-d826789946cc471b10f02cac1c9a01b055ff8573.zip Qt-d826789946cc471b10f02cac1c9a01b055ff8573.tar.gz Qt-d826789946cc471b10f02cac1c9a01b055ff8573.tar.bz2 |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Added qmake check for presence of RHttpDownloadMgr header
qmediaplayer: show buffer status of 0%
Progressive download in Phonon MMF backend: integrated with player
Progressive download in Phonon MMF backend: added download managers
Diffstat (limited to 'src/corelib/tools/qbytearraymatcher.cpp')
0 files changed, 0 insertions, 0 deletions