summaryrefslogtreecommitdiffstats
path: root/src/phonon
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-17 12:57:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-17 12:57:35 (GMT)
commit1970e2d46656db8178636e06c82287f536b626c7 (patch)
tree940dbf36c8cd5feb9e65d653e9d7617e310e27ca /src/phonon
parent87e9034caf90fb02ae2564947b9cbf464b3ca97c (diff)
parentd7213ecceabf79de561cd276429372e09464e62c (diff)
downloadQt-1970e2d46656db8178636e06c82287f536b626c7.zip
Qt-1970e2d46656db8178636e06c82287f536b626c7.tar.gz
Qt-1970e2d46656db8178636e06c82287f536b626c7.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: tst_QDataStream::stream_QPixmap: actualy test QPixmap. Keyboard navigation regression in QTreeView Implement the general blending of ARGB32_pm with SSSE3 QtDeclarative debugging: Add an option not to stream the properties of an object.
Diffstat (limited to 'src/phonon')
0 files changed, 0 insertions, 0 deletions