Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration | Qt Continuous Integration System | 2010-05-25 | 31 | -102/+594 |
|\ | |||||
| * | Updated WebKit to 807157e42add842605ec67d9363dd3f1861748ca | Simon Hausmann | 2010-05-25 | 31 | -102/+594 |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-05-25 | 1 | -1/+2 |
|\ \ | |||||
| * | | Fixed compile with xlC. | Rohan McGovern | 2010-05-25 | 1 | -1/+2 |
* | | | Added autotest for Component.createObject() without Qt.createComponent() | Alan Alpert | 2010-05-24 | 2 | -5/+9 |
* | | | Compiler warning | Aaron Kennedy | 2010-05-24 | 1 | -1/+1 |
* | | | Remove incorrect ASSERT | Aaron Kennedy | 2010-05-24 | 1 | -3/+1 |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-05-24 | 2 | -1/+18 |
|\ \ \ | |||||
| * | | | Don't crash when assigning a Behavior to a grouped property. | Michael Brasser | 2010-05-24 | 2 | -1/+18 |
* | | | | Be slightly more verbose on assigning undefined in binding. | Warwick Allison | 2010-05-24 | 1 | -1/+3 |
|/ / / | |||||
* | | | Do not attempt to setParent of object in a different thread | Warwick Allison | 2010-05-24 | 1 | -3/+5 |
* | | | Don't polish QDeclarativeItems. | Warwick Allison | 2010-05-24 | 2 | -6/+16 |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-05-24 | 11 | -92/+42 |
|\ \ \ | |||||
| * | | | Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivate | Bea Lam | 2010-05-24 | 10 | -94/+34 |
| * | | | Allow resource files to be loaded in WorkerScript | Bea Lam | 2010-05-24 | 1 | -3/+11 |
| * | | | Component::createObject() don't attempt to set parent of null object | Martin Jones | 2010-05-24 | 1 | -4/+6 |
* | | | | Fix TextEdit alignment. | Warwick Allison | 2010-05-24 | 2 | -19/+30 |
|/ / / | |||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-05-23 | 21 | -237/+164 |
|\ \ \ | |||||
| * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-21 | 3 | -57/+106 |
| |\ \ \ | |||||
| | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-21 | 3 | -57/+106 |
| | |\ \ \ | |||||
| | | * | | | Fix FolderListModel parentFolder property's file drive handling | Joona Petrell | 2010-05-21 | 1 | -8/+6 |
| * | | | | | Fix warnings | Olivier Goffart | 2010-05-21 | 2 | -3/+4 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-05-21 | 14 | -184/+118 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixes QGraphicsItem::scroll issues | Bjørn Erik Nilsen | 2010-05-21 | 1 | -140/+68 |
| | * | | | | | Fixes wrong QGraphicsItemCache::boundingRect. | Bjørn Erik Nilsen | 2010-05-21 | 1 | -10/+10 |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-05-21 | 14 | -47/+50 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Revert "Deselect the current selection when the QItemSelectionModel::model is... | Olivier Goffart | 2010-05-21 | 3 | -24/+5 |
| | | * | | | | add missing include | Oswald Buddenhagen | 2010-05-20 | 1 | -0/+2 |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-05-20 | 16 | -52/+72 |
| | | |\ \ \ \ | |||||
| | * | \ \ \ \ | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-05-21 | 1 | -2/+0 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-05-21 | 1 | -2/+0 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-05-20 | 1 | -2/+0 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | Switch Symbian^3 QCursor implementation back to 5.0 way | Shane Kearns | 2010-05-20 | 1 | -2/+0 |
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-05-20 | 118 | -2855/+4135 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Fix crash when using fonts in non-gui QApplication | Eskil Abrahamsen Blomfeldt | 2010-05-20 | 1 | -2/+5 |
| | * | | | | | | | | Deselect the current selection when the QItemSelectionModel::model is reset. | Stephen Kelly | 2010-05-20 | 3 | -5/+24 |
| | * | | | | | | | | Compile with gcc 4.0.1 | Olivier Goffart | 2010-05-20 | 9 | -13/+13 |
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-05-20 | 3 | -32/+30 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | nano optimization of canonicalOrderHelper() | Ritt Konstantin | 2010-05-20 | 1 | -7/+13 |
| | | * | | | | | | | | fix canonicalOrderHelper() for some corner case | Ritt Konstantin | 2010-05-20 | 1 | -4/+4 |
| | | * | | | | | | | | use new QChar::requiresSurrogates() instead of hardcoded value | Ritt Konstantin | 2010-05-20 | 1 | -5/+5 |
| | | * | | | | | | | | prevent fake normalization | Ritt Konstantin | 2010-05-20 | 1 | -2/+4 |
| | | * | | | | | | | | prefer QChar::*surrogate() over hardcoded values | Ritt Konstantin | 2010-05-20 | 1 | -3/+3 |
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-05-19 | 1 | -11/+1 |
| | | |\ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Fixed an assert in QMenu | Thierry Bastian | 2010-05-19 | 1 | -11/+1 |
* | | | | | | | | | | | Ensure QML Global Qt object functions appear in the documentation index | Warwick Allison | 2010-05-21 | 2 | -3/+305 |
* | | | | | | | | | | | doc | Warwick Allison | 2010-05-21 | 1 | -2/+2 |
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Also show file/line numbers on XML query errors. | Warwick Allison | 2010-05-21 | 2 | -1/+20 |
* | | | | | | | | | | Print warnings for xml query syntax errors | Bea Lam | 2010-05-21 | 1 | -7/+10 |
* | | | | | | | | | | Clean up | Bea Lam | 2010-05-21 | 1 | -47/+37 |