summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix compile err with win2005 compiler for multimedia lib.Kurt Korbatits2010-06-251-1/+2
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-06-243-120/+48
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | |\ | |/ /
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | |\ | |/ /
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | |\ | |/ /
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | |\ | |/ /
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | |\ | |/ /
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | |\ | |/ /
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | |\ | |/ /
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | |\ | |/ /
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | |\ | |/ /
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | |\ | |/ /
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | |\ | |/ /
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | |\ | |/ /
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | |\ | |/ /
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | | |\ | | |/ /
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | | |\ | | |/ /
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | | |\ | | |/ /
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | | |\ | | |/ /
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | | |\ | | |/ /
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | | |\ | | |/ /
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+142
| | | |\ | | |/ /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-243-120/+48
| |\ \ \ | | |/ / | |/| |
| | * | Revert "Fixing the race condition in event dispatcher implementation on"axis2010-06-242-56/+10
| | * | Revert "Fixing race condition in qeventdispatcher_symbian.cpp code path"axis2010-06-242-66/+40
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-241-1/+1
| | |\ \ | |/ / /
| | * | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3...Simon Hausmann2010-06-241-1/+1
* | | | Fixed compile error in multimedia moduleKurt Korbatits2010-06-241-0/+4
| |_|/ |/| |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-06-240-0/+0
|\ \ \
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+101
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-244-9/+101
| | |\ \ | |/ / /
* | | | Fixed compile error introduced by win32 surround sound support change.Kurt Korbatits2010-06-241-1/+42
| |/ / |/| |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-06-240-0/+0
|\ \ \
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-242-9/+50
| |\ \ \ | | |/ / | |/| |
* | | | Added surround sound support to alsa low-level audio backend.Kurt Korbatits2010-06-242-0/+51
| |/ / |/| |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-06-2447-392/+748
|\ \ \ | |/ /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-231-3/+0
| |\ \ | | |/
| | * Allow TLW translucency on Symbian without Qt::FramelessWindowHintGareth Stockwell2010-06-231-3/+0
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-233-3/+3
| |\
| | * Updated UIDs for spectrum demoGareth Stockwell2010-06-233-3/+3
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-233-2/+6
| |\ \
| | * | Ensure that compiling with the no debug/warning output defines worksAndy Shaw2010-06-233-2/+6
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-228-183/+199
| |\ \ \ | | |/ /
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-228-183/+199
| | |\ \ | |/ / /
| | * | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906f...Simon Hausmann2010-06-221-4/+3
| | * | Clean up HB_Anchor's DeviceTables on failure when loading format 3Andreas Kling2010-06-221-1/+2
| | * | Make sure ValueRecord's DeviceTables are cleaned up on failureAndreas Kling2010-06-221-2/+3
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-228-176/+191
| | |\ \