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 |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-24 | 8 | -8/+60 |
|\ \ \ | |||||
| * | | | Added autotest for Component.createObject() without Qt.createComponent() | Alan Alpert | 2010-05-24 | 8 | -8/+60 |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-24 | 15 | -30/+80 |
|\ \ \ \ | |/ / / | |||||
| * | | | 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 | 8 | -10/+48 |
| |\ \ \ | |||||
| | * | | | Doc fixes | Yann Bodson | 2010-05-24 | 2 | -5/+5 |
| | * | | | Don't crash when assigning a Behavior to a grouped property. | Michael Brasser | 2010-05-24 | 4 | -1/+38 |
| | * | | | Get rid of 'noise' when using GL and the top-level item is an Item. | Michael Brasser | 2010-05-24 | 1 | -1/+2 |
| | * | | | Fix visual tests after rename of the qml executable. | Michael Brasser | 2010-05-24 | 1 | -3/+3 |
| * | | | | Be slightly more verbose on assigning undefined in binding. | Warwick Allison | 2010-05-24 | 3 | -7/+9 |
| |/ / / | |||||
| * | | | 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-integration | Qt Continuous Integration System | 2010-05-24 | 296 | -421/+11468 |
|\ \ \ \ | |/ / / | |||||
| * | | | Check QML files for license headers too. | Warwick Allison | 2010-05-24 | 1 | -3/+11 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-05-24 | 16 | -93/+62 |
| |\ \ \ | |||||
| | * | | | Make compile: include script module for test | Bea Lam | 2010-05-24 | 1 | -1/+1 |
| | * | | | 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 |
| | * | | | Factor out initialization effects from declarative benchmarks. | Michael Brasser | 2010-05-24 | 4 | -0/+19 |
| * | | | | Fix TextEdit alignment. | Warwick Allison | 2010-05-24 | 2 | -19/+30 |
| |/ / / | |||||
| * | | | Remove license headers from test data. | Warwick Allison | 2010-05-23 | 958 | -39276/+0 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-05-23 | 2472 | -33422/+82636 |
| |\ \ \ | |||||
| | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-21 | 1233 | -59/+50334 |
| | |\ \ \ | |/ / / / |/| | | | | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-21 | 1233 | -59/+50334 |
| | |\ \ \ | |||||
| | | * | | | Fix FolderListModel parentFolder property's file drive handling | Joona Petrell | 2010-05-21 | 4 | -10/+12 |
| | | * | | | Add license headers for .qml files. | Jason McDonald | 2010-05-21 | 1227 | -0/+50179 |
* | | | | | | 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 | 1235 | -33396/+32305 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Fix warnings | Olivier Goffart | 2010-05-21 | 2 | -3/+4 |
| * | | | | | Fix shadow building of spectrum demo | Rhys Weatherley | 2010-05-21 | 1 | -1/+1 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-05-21 | 40 | -249/+465 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixes QGraphicsItem::scroll issues | Bjørn Erik Nilsen | 2010-05-21 | 3 | -141/+158 |
| | * | | | | | 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 | 17 | -76/+181 |
| | |\ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| | * | | | | | changes-4.7.0 updated | Joerg Bornemann | 2010-05-21 | 1 | -1/+1 |
| | * | | | | | Revert "Deselect the current selection when the QItemSelectionModel::model is... | Olivier Goffart | 2010-05-21 | 4 | -67/+9 |
| | * | | | | | 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 | 20 | -84/+247 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | 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 | 19 | -84/+245 |
| | | |\ \ \ \ \ | |||||
* | | | \ \ \ \ \ | 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 | 7 | -16/+140 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-05-21 | 7 | -16/+140 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-05-20 | 1 | -9/+81 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | My 4.6.3 changes. | Trond Kjernåsen | 2010-05-20 | 1 | -16/+73 |
| | | * | | | | | | | | Added my 4.6.3 changes. | Kim Motoyoshi Kalland | 2010-05-20 | 1 | -1/+4 |
| | | * | | | | | | | | My 4.6.3 changes. | Samuel Rødal | 2010-05-20 | 1 | -0/+12 |