summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6-s60' into 4.7-s60axis2010-06-2413-133/+65
|\
| * 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
| * | 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
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix QTBUG-8687.Aleksandar Sasha Babic2010-06-181-3/+8
| | * | | | Debug prints and another attempt to fix QTBUG-8687 for N8.Aleksandar Sasha Babic2010-06-181-0/+9
| | | | * | Phonon(qt7); Don't try and display video frames when audio only.Justin McPherson2010-06-221-7/+9
| | | |/ /
| | | * | Audio(osx); Fix period size calculation.Justin McPherson2010-06-221-13/+2
| | | * | Audio(osx); refactor input period conversionJustin McPherson2010-06-221-24/+25
| | | * | Audio(osx); Fix audio format converters.Justin McPherson2010-06-221-3/+6
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-06-2434-379/+1174
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-248-5/+46
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-248-5/+46
| | |\ \ \ \ \
| | | * | | | | Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2eSimon Hausmann2010-06-238-5/+47
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2426-374/+1128
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Abort open early if network session is in the process of openning.Aaron McCarthy2010-06-242-5/+20
| | * | | | | | Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-243-70/+61
| | * | | | | | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-241-6/+29
| | * | | | | | Cherry pick fix for QTMOBILITY-253 from Qt Mobility.Aaron McCarthy2010-06-245-5/+5
| | * | | | | | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-242-57/+96
| | * | | | | | Cherry pick fix for MOBILITY-965 from Qt Mobility.Aaron McCarthy2010-06-243-10/+147
| | * | | | | | Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-243-7/+31
| | * | | | | | Cherry pick fix for MOBILITY-853 from Qt Mobility.Aaron McCarthy2010-06-242-0/+71
| | * | | | | | Cherry pick fix for MOBILITY-1047 from Qt Mobility.Aaron McCarthy2010-06-241-2/+9