summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-1817-101/+365
|\ \ \ \ \
| * | | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5699175f5...Simon Hausmann2010-06-182-17/+31
| * | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-183-1/+15
| * | | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 508b02a25...Simon Hausmann2010-06-183-55/+57
| * | | | | Re-enable data structure packing in Harfbuzz for RVCTSimon Hausmann2010-06-183-15/+15
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-1812-14/+248
| |\ \ \ \ \
| | * | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-1812-14/+248
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-181-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed device context leak in QGLWidget on Windows.Kim Motoyoshi Kalland2010-06-181-0/+3
| | | | | * 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.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-181-0/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixed memory lean in QImageVideoBuffer and QMemoryVideoBuffer.Dmytro Poplavskiy2010-06-181-0/+3
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-171-2/+17
|\ \ \ \ | |_|/ / |/| | |
| * | | QLocalSocket/Win: handle ERROR_MORE_DATA after read operationJoerg Bornemann2010-06-171-2/+17
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-172-3/+30
|\ \ \ \
| * | | | Fix possible crash in QTextLayout for glyphless itemsEskil Abrahamsen Blomfeldt2010-06-172-3/+30
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-173-32/+9
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Attempt to stabilize tst_qtimeline::valueRohan McGovern2010-06-171-12/+0
| * | | | Attempt to stabilize tst_lconvertRohan McGovern2010-06-161-1/+1
| * | | | Replace custom WAIT_FOR_CONDITION with semi-standard QTRY_COMPARERohan McGovern2010-06-161-14/+2
| * | | | Attempt to stabilize tst_qwidget::taskQTBUG_4055_sendSyntheticEnterLeaveRohan McGovern2010-06-161-4/+4