Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-05-20 | 3 | -18/+9 |
|\ | |||||
| * | Use QApplication::arguments() to check for command line args | Harald Fernengel | 2010-05-20 | 3 | -18/+9 |
* | | Fix incorrect merge | Alan Alpert | 2010-05-20 | 1 | -1/+1 |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-05-20 | 8 | -17/+21 |
|\ \ | |/ | |||||
| * | Rename Component::errorsString() -> errorString() (and also for | Bea Lam | 2010-05-20 | 4 | -7/+7 |
| * | Fixes for docs, example code | Bea Lam | 2010-05-20 | 4 | -11/+10 |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-19 | 44 | -178/+53 |
| |\ | |||||
| * \ | Merge commit 'remotes/origin/4.7' into symbian47 | Thomas Zander | 2010-05-19 | 4 | -290/+439 |
| |\ \ | |||||
| * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-05-18 | 1 | -0/+5 |
| |\ \ \ | |||||
| | * | | | Fix 'chapter5_plugins.dll.sym contains initialized writable data' | Alessandro Portale | 2010-05-17 | 1 | -0/+5 |
* | | | | | Fix dynamicscene example | Alan Alpert | 2010-05-19 | 3 | -5/+16 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-19 | 44 | -178/+53 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Remove image example (covered in class docs) | Bea Lam | 2010-05-19 | 9 | -175/+0 |
| * | | | Add missing .qmlproject files | Bea Lam | 2010-05-19 | 3 | -0/+48 |
| * | | | Rename some examples: proxyviewer -> networkaccessmanagerfactory, | Bea Lam | 2010-05-18 | 33 | -19/+21 |
| |/ / | |||||
* | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-05-18 | 4 | -290/+439 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Olivier Goffart | 2010-05-17 | 4 | -290/+439 |
| |\ \ | | |/ | |/| | |||||
| | * | Modified audiodevices example to list all supported formats | Gareth Stockwell | 2010-05-07 | 4 | -290/+439 |
* | | | Compile fixes. | ck | 2010-05-17 | 2 | -0/+4 |
|/ / | |||||
* | | Move xmldata example into rssnews demo. | Yann Bodson | 2010-05-17 | 3 | -146/+0 |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-17 | 381 | -218/+232 |
|\ \ | |||||
| * | | Add missing .pro | Bea Lam | 2010-05-17 | 1 | -0/+5 |
| * | | Restructure the examples. They are now organized into various | Bea Lam | 2010-05-16 | 380 | -218/+227 |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-05-15 | 6 | -6/+32 |
|\ \ \ | |||||
| * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-05-14 | 6 | -6/+32 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-05-14 | 6 | -6/+32 |
| | |\ \ | |||||
| | | * \ | Merge remote branch 'staging/4.7' into bearermanagement/mobility-changes-squash | Aaron McCarthy | 2010-05-14 | 5 | -5/+16 |
| | | |\ \ | |||||
| | | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Peter Yard | 2010-05-14 | 95 | -565/+1871 |
| | | | |\ \ | |||||
| | | | * | | | Added snippet labels to QML Dial example. | Peter Yard | 2010-05-14 | 2 | -2/+14 |
| | | * | | | | Bearer management changes from Qt Mobility. | Aaron McCarthy | 2010-05-14 | 4 | -4/+18 |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-05-14 | 1 | -0/+208 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge branch '4.7' of scm.dev-nokia.troll.no:qt/oslo-staging-2 into 4.7 | Andreas Aardal Hanssen | 2010-05-14 | 3 | -3/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| * | | | | | | Add missing file! | Andreas Aardal Hanssen | 2010-05-14 | 1 | -0/+208 |
* | | | | | | | Rename QML Runtime (executable) to QML Launcher | Kai Koehne | 2010-05-14 | 1 | -1/+1 |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-14 | 6 | -0/+60 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-05-13 | 2 | -2/+2 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Add an example spinner. | Martin Jones | 2010-05-13 | 6 | -0/+60 |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-05-13 | 12 | -672/+604 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | |||||
| * | | | | | Documentation for the Pad Navigator Example. | Andreas Aardal Hanssen | 2010-05-12 | 9 | -108/+186 |
| * | | | | | New Pad Nagivator example implementation. | Andreas Aardal Hanssen | 2010-05-12 | 12 | -670/+524 |
| | |/ / / | |/| | | | |||||
* | | | | | Flickable small API changes. | Yann Bodson | 2010-05-12 | 2 | -2/+2 |
| |/ / / |/| | | | |||||
* | | | | Clean up | Bea Lam | 2010-05-11 | 1 | -1/+0 |
|/ / / | |||||
* | | | Removed multimedia effects from tvtennis declarative example | Leonardo Sobral Cunha | 2010-05-10 | 3 | -8/+0 |
* | | | There is no Qt.widgets | Warwick Allison | 2010-05-10 | 1 | -1/+0 |
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-05-07 | 24 | -219/+247 |
|\ \ \ | |||||
| * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-05-07 | 17 | -48/+41 |
| |\ \ \ | |||||
| | * | | | More cleanup | Yann Bodson | 2010-05-06 | 5 | -15/+15 |
| | * | | | Cleanup | Yann Bodson | 2010-05-06 | 3 | -5/+5 |
| | * | | | Cleanup | Yann Bodson | 2010-05-06 | 7 | -26/+18 |
| | * | | | Use enum for drag.axis in doc and examples. | Yann Bodson | 2010-05-06 | 4 | -4/+4 |