summaryrefslogtreecommitdiffstats
path: root/src/phonon
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-20 08:25:54 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-20 08:25:54 (GMT)
commit6ccff8baa04c4467f7185676b5c632f17fd7ae4c (patch)
tree5102a93ab6daa3ce8c794e07c547c44786b41e7b /src/phonon
parent7706b14fbca90a339a4ed1e55549f100462f9df4 (diff)
parent04d4cbeb36f75661aca06f93066a8603afd96f76 (diff)
downloadQt-6ccff8baa04c4467f7185676b5c632f17fd7ae4c.zip
Qt-6ccff8baa04c4467f7185676b5c632f17fd7ae4c.tar.gz
Qt-6ccff8baa04c4467f7185676b5c632f17fd7ae4c.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: QScriptClass-implemented constructors lead to application crash Improve test coverage of QScriptClass::Callable extension
Diffstat (limited to 'src/phonon')
0 files changed, 0 insertions, 0 deletions