summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns/functions/qstringvaluefns.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-15 07:13:32 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-15 07:13:32 (GMT)
commit88a8b8e3d8f05b55c22e3d3a5f7a59aaf49463dc (patch)
treeeb3ac6bbc107e01fe3c8f7004fa658f1baff89e2 /src/xmlpatterns/functions/qstringvaluefns.cpp
parentfbdbcf9d89df56ac6283c1d5e8a65e7ee1fb3d40 (diff)
parent0ebc9a600af8188e7a9d3c2904d012c6289a515d (diff)
downloadQt-88a8b8e3d8f05b55c22e3d3a5f7a59aaf49463dc.zip
Qt-88a8b8e3d8f05b55c22e3d3a5f7a59aaf49463dc.tar.gz
Qt-88a8b8e3d8f05b55c22e3d3a5f7a59aaf49463dc.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed compiler warning Phonon MMF: fixed crash during opening of video clip Phonon MMF: ensure initial volume is applied Phonon MMF: fix state changes emitted during playlist handling Phonon MMF: calling pause() when in StoppedState triggers stateChanged() Phonon MMF: change to PausedState, not StoppedState when finished Phonon MMF: Suppress intermediate stateChanged() signal Phonon MMF: Emit tick() signal Phonon MMF: Emit prefinishMarkReached(), finished() signals Phonon MMF: Removed compiler warning tst_mediaobject: ensure MediaObject is in StoppedState before each step tst_mediaobject: Removed non-portable escape codes from output tst_mediaobject: Ensure playSDP step cleanup is run tst_mediaobject: Removed compiler warnings tst_mediaobject: Removed compiler warnings
Diffstat (limited to 'src/xmlpatterns/functions/qstringvaluefns.cpp')
0 files changed, 0 insertions, 0 deletions