summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2010-03-25 06:00:55 (GMT)
committerAlexis Menard <alexis.menard@nokia.com>2010-03-25 06:00:55 (GMT)
commit32b5fdfabf3158c7b03d1011f4551a45371b27e3 (patch)
tree0339732e5529917a52eb7ff86e6209c262ab7032 /dist
parentd373f8b8ee0a5841bcdb264b0b01b262c15e7f89 (diff)
parenta4f0b174dd7d6eb837915d9d99b2067b8cb00187 (diff)
downloadQt-32b5fdfabf3158c7b03d1011f4551a45371b27e3.zip
Qt-32b5fdfabf3158c7b03d1011f4551a45371b27e3.tar.gz
Qt-32b5fdfabf3158c7b03d1011f4551a45371b27e3.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
Diffstat (limited to 'dist')
-rw-r--r--dist/changes-4.6.38
1 files changed, 8 insertions, 0 deletions
diff --git a/dist/changes-4.6.3 b/dist/changes-4.6.3
index 57cc453..d8e9fb4 100644
--- a/dist/changes-4.6.3
+++ b/dist/changes-4.6.3
@@ -138,6 +138,14 @@ Qt for Windows CE
-
+Qt for Symbian
+--------------
+
+ - [QT-567] Implementation of QtMultimedia QAudio* APIs
+ - [QTBUG-8919] Modified Phonon MMF backend to support video playback on
+ platforms which use graphics surfaces (i.e. platforms using the
+ New Graphics Architecture a.k.a. ScreenPlay)
+
****************************************************************************
* Tools *
****************************************************************************