Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7 | Jani Hautakangas | 2011-06-22 | 1 | -2/+3 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-06-21 | 1 | -2/+3 |
| |\ | |||||
| | * | Fix crash in PropertyChanges. | Michael Brasser | 2011-06-21 | 1 | -2/+3 |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-06-21 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | Create property cache in case of Component{} root | Aaron Kennedy | 2011-06-10 | 1 | -0/+6 |
* | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-06-17 | 5 | -35/+45 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-06-09 | 2 | -4/+13 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix docs on caching for images loaded by image providers | Bea Lam | 2011-06-02 | 2 | -4/+13 |
| | * | | | Merge remote-tracking branch 'qt/4.8' into master-qml-team | Kai Koehne | 2011-05-24 | 149 | -2567/+2603 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-06-08 | 1 | -27/+28 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge remote branch 'origin/4.7' into 4.8-from-4.7 | Rohan McGovern | 2011-06-01 | 1 | -27/+28 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-06-01 | 1 | -27/+28 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | QDeclarative: Fix QPerformanceTimer on Symbian | Kai Koehne | 2011-06-01 | 1 | -27/+28 |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-17 | 149 | -2552/+2552 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | | * | | | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 149 | -2552/+2552 |
| * | | | | | | Merge remote branch 'qt/4.8' into fire-master | Paul Olav Tvete | 2011-06-06 | 149 | -2582/+2661 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-05-24 | 2 | -1/+4 |
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | | * | | | | Merge remote branch 'qt-qml-review/master' into master-qml-staging | Kai Koehne | 2011-05-23 | 2 | -1/+4 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | Doc | Aaron Kennedy | 2011-05-16 | 1 | -0/+3 |
| | | | * | | | QmlDirParser: Fix typeInfo accessor. | Kai Koehne | 2011-05-12 | 1 | -1/+1 |
| * | | | | | | Fixed inconsistent behaviour in Qt.rect(). | Kim Motoyoshi Kalland | 2011-05-20 | 1 | -3/+0 |
* | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-05-24 | 149 | -2582/+2658 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-18 | 2 | -0/+4 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-16 | 7 | -30/+102 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-06 | 2 | -0/+4 |
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | / / | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Uninitialized memory is compared. | Martin Jones | 2011-05-05 | 2 | -0/+4 |
| | | | |_|/ | | | |/| | | |||||
| * | | | | | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-16 | 2 | -0/+33 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-... | Kai Koehne | 2011-05-12 | 2 | -0/+33 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Allow 'typeinfo <file>' lines in qmldir. | Christian Kamm | 2011-05-12 | 2 | -0/+33 |
| * | | | | | Update licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-13 | 149 | -2552/+2552 |
| |/ / / / | |||||
| * | | | | Merge remote branch 'qt/4.8' into master-qml-staging | Kai Koehne | 2011-05-10 | 8 | -15/+47 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| * | | | Augment documentation | Alan Alpert | 2011-05-09 | 1 | -0/+2 |
| * | | | QmlDebugger: removing slots in Live Preview | Christiaan Janssen | 2011-05-06 | 1 | -1/+4 |
| * | | | QmlDebugger: adding slots to items in Live Preview | Christiaan Janssen | 2011-05-06 | 2 | -5/+14 |
| * | | | Removed some trailing whitespace | Thorbjørn Lindeijer | 2011-05-04 | 2 | -22/+22 |
| * | | | Introduced a CONFIG option that enables declarative debug services | Thorbjørn Lindeijer | 2011-05-04 | 2 | -0/+22 |
| * | | | Moved the QML Observer Service and related functionality into Qt | Thorbjørn Lindeijer | 2011-05-04 | 2 | -2/+5 |
* | | | | Doc: Fixed qdoc warnings. | David Boddie | 2011-05-11 | 1 | -7/+17 |
| |/ / |/| | | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-05-04 | 3 | -1/+87 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of ../qt-qml-staging | Michael Brasser | 2011-04-14 | 7 | -33/+71 |
| |\ \ | |||||
| * \ \ | Merge ../qt-qml-staging | Yann Bodson | 2011-03-29 | 3 | -2/+16 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Alan Alpert | 2011-03-23 | 3 | -2/+65 |
| |\ \ \ \ | |||||
| * | | | | | Optimization and benchmark for setting object properties from QML. | Michael Brasser | 2011-03-16 | 1 | -0/+27 |
| * | | | | | Merge branch 'master' of ../qt-qml-staging | Yann Bodson | 2011-03-16 | 4 | -11/+24 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add Constant and Final flags to QMetaObjectBuilder | Bea Lam | 2011-03-14 | 2 | -1/+60 |
* | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-04-21 | 1 | -3/+9 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-20 | 1 | -3/+9 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | QDeclarativeDebug: Fix endless loop for property with SCRITABLE false | Kai Koehne | 2011-04-20 | 1 | -3/+9 |
* | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-04-20 | 3 | -8/+26 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-18 | 3 | -8/+26 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / |