summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * 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
| |\ \ \
| | * \ \ 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
| | |\ \ \
| | | * | | Fix null HB_Device** dereference on exit in Harfbuzz GPOS codeAndreas Kling2010-06-214-17/+21
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andy Shaw2010-06-2123-115/+410
| | | |\ \ \
| | | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-216-34/+45
| | | | |\ \ \
| | | | | * | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b6...Simon Hausmann2010-06-203-33/+8
| | | | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-203-1/+37
| | | * | | | | Prevent warnings about EPOCROOT coming out when not on symbianAndy Shaw2010-06-211-125/+125
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-221-7/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-06-2221-141/+448
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-223-40/+33
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-212-40/+66
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Fixing race condition in qeventdispatcher_symbian.cpp code pathAleksandar Sasha Babic2010-06-212-40/+66
|/ / / / / /
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-211-0/+14
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |