Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge bearermanagement changes from Qt Mobility. | Aaron McCarthy | 2010-06-24 | 6 | -4/+354 |
* | Cherry pick fix for MOBILITY-938 from Qt Mobility. | Aaron McCarthy | 2010-06-24 | 4 | -105/+174 |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-06-23 | 1 | -0/+128 |
|\ | |||||
| * | Fix missing QImage::Format to QVideoFrame::PixelFormat conversion. | Andrew den Exter | 2010-06-23 | 1 | -0/+128 |
* | | Merge remote branch 'origin/4.7' into qml-4.7 | Rohan McGovern | 2010-06-22 | 4 | -4/+23 |
|\ \ | |||||
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-06-22 | 1 | -1/+0 |
| |\ \ | |||||
| | * | | Removed unnecessary data_caging_paths.prf loading from applications | Miikka Heikkinen | 2010-06-22 | 1 | -1/+0 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-21 | 3 | -3/+23 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Andy Shaw | 2010-06-21 | 162 | -328/+1583 |
| | |\ \ | |||||
| | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-21 | 2 | -2/+2 |
| | | |\ \ | |||||
| | | | * | | Allow GNU Free Documentation license header. | Jason McDonald | 2010-06-21 | 1 | -1/+1 |
| | | | * | | Fixed tst_QNetworkDiskCache creating badly named directories. | Rohan McGovern | 2010-06-17 | 1 | -1/+1 |
| | * | | | | Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText() | Andy Shaw | 2010-06-21 | 1 | -1/+21 |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-06-22 | 6 | -36/+32 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-06-21 | 6 | -36/+32 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-20 | 6 | -36/+32 |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-06-17 | 1 | -0/+19 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fix possible crash in QTextLayout for glyphless items | Eskil Abrahamsen Blomfeldt | 2010-06-17 | 1 | -0/+19 |
| | | * | | | | | Attempt to stabilize tst_qtimeline::value | Rohan McGovern | 2010-06-17 | 1 | -12/+0 |
| | | * | | | | | Attempt to stabilize tst_lconvert | Rohan McGovern | 2010-06-16 | 1 | -1/+1 |
| | | * | | | | | Replace custom WAIT_FOR_CONDITION with semi-standard QTRY_COMPARE | Rohan McGovern | 2010-06-16 | 1 | -14/+2 |
| | | * | | | | | Attempt to stabilize tst_qwidget::taskQTBUG_4055_sendSyntheticEnterLeave | Rohan McGovern | 2010-06-16 | 1 | -4/+4 |
| | | * | | | | | Attempt to stabilize tst_qwidget::syntheticEnterLeave | Rohan McGovern | 2010-06-16 | 1 | -1/+2 |
| | | * | | | | | Attempt to stabilize tst_qwidgetaction::visibilityUpdate | Rohan McGovern | 2010-06-16 | 1 | -4/+6 |
| | | * | | | | | Attempt to stabilize tst_lupdate::good | Rohan McGovern | 2010-06-16 | 1 | -1/+1 |
| | | |/ / / / | |||||
* | | | | | | | Allow QT_TR_NOOP (as a no-op) in ListModel values. | Warwick Allison | 2010-06-22 | 1 | -3/+7 |
|/ / / / / / | |||||
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-21 | 5 | -1/+110 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fix test | Bea Lam | 2010-06-18 | 1 | -0/+3 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-17 | 5 | -1/+107 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Auto test for QTBUG-11507 | Bea Lam | 2010-06-17 | 3 | -0/+28 |
| | * | | | | Properly update childrenRect for position changes and shrinking. | Michael Brasser | 2010-06-17 | 2 | -1/+79 |
* | | | | | | Start the implementation of in-place recoding for images | Benjamin Poulain | 2010-06-20 | 8 | -0/+37 |
|/ / / / / | |||||
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-17 | 5 | -5/+234 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Usefully convert from QtScript object/array to QVariant | Kent Hansen | 2010-06-17 | 5 | -5/+234 |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-17 | 4 | -7/+52 |
|\ \ \ \ \ | |||||
| * | | | | | Add test for model data changes. | Martin Jones | 2010-06-17 | 2 | -2/+47 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-16 | 2 | -5/+5 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-06-16 | 1 | -0/+28 |
| | |\ \ \ \ | |||||
| | * | | | | | Minor demo fixes | Alan Alpert | 2010-06-16 | 1 | -4/+5 |
| | * | | | | | Fix autoScroll implementation | Alan Alpert | 2010-06-16 | 1 | -1/+0 |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-06-17 | 1 | -22/+64 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-06-16 | 1 | -22/+64 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Fixed problem with wrong size hints when items were removed. | Jan-Arve Sæther | 2010-06-16 | 1 | -22/+64 |
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-16 | 4 | -4/+4 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-06-15 | 9 | -9/+9 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Bump version number after 4.6.3 release. | Jason McDonald | 2010-06-15 | 9 | -9/+9 |
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-16 | 13 | -34/+97 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-16 | 13 | -34/+97 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Temporary fix for regression in QSslCertificate::fromPath() | Zeno Albisser | 2010-06-15 | 1 | -0/+3 |
| | * | | | | | | Fix symbian building of TARGET with a slash | Thomas Zander | 2010-06-15 | 1 | -1/+1 |