summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2117-18/+79
|\
| * Update 4.7-beta2 def filesShane Kearns2010-06-216-6/+39
| * Added Samsung and Sony-Ericsson manufacturer IDs to sqlite3.sisMiikka Heikkinen2010-06-211-0/+0
| * Fix for TLS problem which causes apps to crash in the S60 portmread2010-06-211-1/+28
| * Fixed bearer plugin deployment in libinfixed buildsMiikka Heikkinen2010-06-181-3/+3
| * Always add QtNetwork include path when linking with QtWebkit in SymbianMiikka Heikkinen2010-06-181-1/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-187-7/+7
| |\
| | * Assigning 0xA UID3s to the new standalone qml demosAlessandro Portale2010-06-177-7/+7
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-2112-43/+73
|\ \ \
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-2010-41/+66
| |\ \ \
| | * \ \ 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
| | * | | | | 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
| | | * | | | | Attempt to stabilize tst_qwidget::syntheticEnterLeaveRohan McGovern2010-06-161-1/+2
| | |/ / / / /
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-162-5/+7
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Attempt to stabilize tst_qwidgetaction::visibilityUpdateRohan McGovern2010-06-161-4/+6
| | | * | | | Attempt to stabilize tst_lupdate::goodRohan McGovern2010-06-161-1/+1
| * | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-172-2/+7
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-172-2/+7
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-162-2/+7
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-163-2/+15
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-163-2/+15
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-162-2/+7
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-06-1627-115/+263
| | | | | |\ \ \ \
| | | | | * | | | | Audio (osx); In pull mode emit readyRead() for each period received.Justin McPherson2010-06-161-2/+2
| | | | | * | | | | AudioInput example; disconnect from the built-in device when changing mode.Justin McPherson2010-06-161-0/+5
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2129-109/+282
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Avoid printing a warningAlan Alpert2010-06-211-1/+2
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-2163-243/+1322
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix testBea Lam2010-06-181-0/+3
| | * | | | | | | | | | ListView doc improvements and examples clean upBea Lam2010-06-1811-34/+53
| | * | | | | | | | | | Doc fixesBea Lam2010-06-182-23/+13
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1713-49/+202
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |