summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextengine.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-09 05:27:28 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-09 05:27:28 (GMT)
commit64a360f45ab9a1c50ca628cfd6b670b93816c756 (patch)
tree3c362ab47af7b19be6351315b8e34e538b23c319 /src/gui/text/qtextengine.cpp
parent7327d31b4e20bd4b3e3bad95c2fba3eb7a548dbb (diff)
parent544bbfadc0703597b7084213261053ca0e2facf6 (diff)
downloadQt-64a360f45ab9a1c50ca628cfd6b670b93816c756.zip
Qt-64a360f45ab9a1c50ca628cfd6b670b93816c756.tar.gz
Qt-64a360f45ab9a1c50ca628cfd6b670b93816c756.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Corruption in data captured by QAudioInput Just one (static) waveInCriticalSection but multiple QAudioInput to Mismatch between reported and actual supported sample rates in
Diffstat (limited to 'src/gui/text/qtextengine.cpp')
0 files changed, 0 insertions, 0 deletions