Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-16 | 25 | -50/+1618 |
|\ | |||||
| * | 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 |
| * | | Merge remote branch 'qt/4.8' into master-qml-staging | Kai Koehne | 2011-05-10 | 27 | -103/+285 |
| |\ \ | |||||
| * | | | Enable performance monitoring at application startup. | Kai Koehne | 2011-05-10 | 9 | -9/+118 |
| | |/ | |/| | |||||
| * | | 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 |
| * | | Added forgotten file qdeclarativeobserverinterface_p.h | Thorbjørn Lindeijer | 2011-05-04 | 1 | -0/+69 |
| * | | 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 | 10 | -5/+1323 |
| * | | QDeclarativeDebugServer: Send hello answer before any service messages | Thorbjørn Lindeijer | 2011-05-02 | 1 | -8/+11 |
* | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-05-13 | 3 | -4/+36 |
|\ \ \ | |||||
| * | | | QDeclarativeMouseArea: block context menu events | Caio Marcelo de Oliveira Filho | 2011-05-13 | 2 | -0/+29 |
| * | | | ListViews loses items if all visible items are removed. | Martin Jones | 2011-05-13 | 1 | -4/+7 |
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-06 | 5 | -0/+13 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | Views do not notify count changes properly | Martin Jones | 2011-05-05 | 3 | -0/+9 |
| * | | Uninitialized memory is compared. | Martin Jones | 2011-05-05 | 2 | -0/+4 |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-05-05 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Fix compilation with QT_NO_* | Tasuku Suzuki | 2011-05-02 | 1 | -0/+2 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-05-04 | 5 | -2/+133 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Merge branch 'master' of ../qt-qml-staging | Michael Brasser | 2011-04-14 | 41 | -417/+640 |
| |\ \ | |||||
| * | | | QDeclarativeDebug: Handle case where client with ongoing queries is deleted | Kai Koehne | 2011-03-30 | 1 | -0/+46 |
| * | | | Merge ../qt-qml-staging | Yann Bodson | 2011-03-29 | 9 | -41/+75 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Alan Alpert | 2011-03-23 | 12 | -19/+102 |
| |\ \ \ \ | |||||
| * | | | | | 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 | 43 | -608/+2097 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add Constant and Final flags to QMetaObjectBuilder | Bea Lam | 2011-03-14 | 2 | -1/+60 |
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-staging | Martin Jones | 2011-03-01 | 34 | -220/+440 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fixed QML TextEdit docs | Thiago Marcos P. Santos | 2011-02-25 | 1 | -1/+0 |
* | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-04-29 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-04-28 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | Clear the root index when the model is reset. | Girish Ramakrishnan | 2011-04-27 | 1 | -0/+5 |
| | * | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7 | Martin Jones | 2011-04-27 | 26 | -193/+219 |
| | |\ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ | Merge branch '4.8-upstream' | Thierry Bastian | 2011-04-28 | 21 | -96/+263 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-04-27 | 5 | -8/+32 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-04-27 | 5 | -8/+32 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-27 | 3 | -4/+13 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | / / / / / / / | | | | |/ / / / / / / | | | |/| | | | | | | | |||||
| | | | * | | | | | | | Ignore changes to selectByMouse during a selection. | Andrew den Exter | 2011-04-27 | 2 | -4/+11 |
| | | | * | | | | | | | PathView offset out of sync with currentIndex when items are removed. | Martin Jones | 2011-04-27 | 1 | -0/+2 |
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-27 | 1 | -1/+5 |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | |||||
| | | | * | | | | | | | Move the TextInput cursor delegate when the preedit position changes. | Andrew den Exter | 2011-04-27 | 1 | -1/+5 |
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-04-26 | 2 | -3/+14 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Support text decoration in QML when using static text back-end | Eskil Abrahamsen Blomfeldt | 2011-04-18 | 1 | -0/+10 |
| | | | * | | | | | | | | Fix missing color in text when using static text back-end in QML | Eskil Abrahamsen Blomfeldt | 2011-04-18 | 2 | -3/+4 |
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-04-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Fix warning about ASCII cast in calling QString::contains | Thiago Macieira | 2011-04-26 | 1 | -1/+1 |
| * | | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-04-26 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-04-26 | 1 | -3/+1 |
| | |\ \ \ \ \ \ \ \ \ |