summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-22159-673/+1282
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-2213-95/+98
| |\
| | * Remove transparent.qml example for now, until QTBUG-11591 is fixedBea Lam2010-06-221-55/+0
| | * qmldir no longer necessaryBea Lam2010-06-221-4/+0
| | * Add demo thumbnails to Examples/Demos index to make it more interestingBea Lam2010-06-2210-35/+74
| | * DocAaron Kennedy2010-06-221-1/+24
| * | Handle TextInput inputMethodEvent() properlyMartin Jones2010-06-222-2/+18
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-22125-487/+680
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2296-426/+528
| | |\
| | | * Add screenshots for most examples and demosBea Lam2010-06-2250-33/+283
| | | * Rename example: edit -> textselectionBea Lam2010-06-226-0/+16
| | | * Clean up some examplesBea Lam2010-06-2237-374/+195
| | | * Rename example and add minor improvementsBea Lam2010-06-221-17/+32
| | | * Rename example image fileBea Lam2010-06-222-1/+1
| | | * Spelling fixBea Lam2010-06-221-1/+1
| | * | 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
| | | |\ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |