summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtextcodec
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-21 14:39:13 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-21 14:39:13 (GMT)
commitd47900969aca5532a707d311965a69a1cf1ea5b1 (patch)
treeba0e2971d12a8ba7bdee582767a3f0c0f0e5d2d1 /tests/auto/qtextcodec
parent2181a341839b72a627a7ef641de58d1d2411f123 (diff)
parent46f7f9237affe5217ad6068f8b717128a5c62ecc (diff)
downloadQt-d47900969aca5532a707d311965a69a1cf1ea5b1.zip
Qt-d47900969aca5532a707d311965a69a1cf1ea5b1.tar.gz
Qt-d47900969aca5532a707d311965a69a1cf1ea5b1.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.
Diffstat (limited to 'tests/auto/qtextcodec')
0 files changed, 0 insertions, 0 deletions