summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-07 07:08:51 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-07 07:08:51 (GMT)
commit62a2fe9092d3b6038a08f5c5a7faa4a863b84fdc (patch)
tree2fe7b9ec43c86ca7bdac72978347120ed3390384 /src/3rdparty/phonon
parentc78f753d544f87e06903b2b6250a32e6f8147c3c (diff)
parenteae8c143428128a4bea4c06cff93b38189da267d (diff)
downloadQt-62a2fe9092d3b6038a08f5c5a7faa4a863b84fdc.zip
Qt-62a2fe9092d3b6038a08f5c5a7faa4a863b84fdc.tar.gz
Qt-62a2fe9092d3b6038a08f5c5a7faa4a863b84fdc.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (36 commits) Fix failure on Windows after commit ccd3f66 tst_qtcpserver: Another attempt to reproduce QTBUG-14268 Fix crash when constructing QThreadStorage after global destructors have run tst_qtcpsocket: Attempt to reproduce QTBUG-14268 Fixed a buffer overrun when pasting large data from non-Qt apps Fix copying large data to non-Qt applications fix regexp in "make custom command handling in vc(x)proj files sane" qmake: Include -pthread when reducing duplicate library arguments qmake: Ensure right library order when reducing duplicate libraries rebuild configure.exe make QMAKE_POST_LINK handling in nmake generator sane make custom command handling in vc(x)proj files sane Revert "QWorkspace: fix hardcoded min size overwriting the real min size" QtScript/JavaScriptCore: Backport random number generator seeding fix Fix performance regression in QUuid::createUuid() Update japanese translations. Ensure that the underline is only drawn when expected for an accel Small improvement in the textedit demo My changes for 4.7.1 QWorkspace: fix hardcoded min size overwriting the real min size ...
Diffstat (limited to 'src/3rdparty/phonon')
0 files changed, 0 insertions, 0 deletions